database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-08-07 03:22:57 +03:00
Code Activity

MCOL-462

Browse Source
This commit is contained in:
David Hill
2017-01-04 13:18:41 -06:00
parent 2a8b29274f
commit 4b68b5d6ba
2 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
oam/oamcpp/liboamcpp.cpp
View File

@@ -5964,6 +5964,9 @@ namespace oam
catch(...) {} catch(...) {}
writeLog("addUMdisk - Create new Volume for um" + itoa(moduleID), LOG_TYPE_DEBUG); writeLog("addUMdisk - Create new Volume for um" + itoa(moduleID), LOG_TYPE_DEBUG);
cout << " Create AWS Volume for UM #" << itoa(moduleID) << endl;
volumeName = createEC2Volume(UMVolumeSize, "um"); volumeName = createEC2Volume(UMVolumeSize, "um");
if ( volumeName == "failed" ) { if ( volumeName == "failed" ) {
writeLog("addModule: create volume failed", LOG_TYPE_CRITICAL); writeLog("addModule: create volume failed", LOG_TYPE_CRITICAL);
@@ -5984,6 +5987,7 @@ namespace oam
//format attached volume //format attached volume
writeLog("addUMdisk - Format new Volume for: " + volumeName, LOG_TYPE_DEBUG); writeLog("addUMdisk - Format new Volume for: " + volumeName, LOG_TYPE_DEBUG);
cout << " Formatting disk for UM #" << itoa(moduleID) << ", please wait..." << endl;
string cmd; string cmd;
int user; int user;

17
oamapps/postConfigure/postConfigure.cpp
View File

@@ -2103,7 +2103,6 @@ int main(int argc, char *argv[])
{ {
//create new UM volume //create new UM volume
try{ try{
oam.addUMdisk(moduleID, volumeName, deviceName, UMVolumeSize); oam.addUMdisk(moduleID, volumeName, deviceName, UMVolumeSize);
} }
catch(...) { catch(...) {
@@ -4242,9 +4241,9 @@ bool storageSetup(bool amazonInstall)
else else
{ {
cout << "NOTE: The volume type. This can be gp2 for General Purpose SSD, io1 for" << endl; cout << endl << "NOTE: The volume type. This can be gp2 for General Purpose SSD, io1 for" << endl;
cout << " Provisioned IOPS SSD, st1 for Throughput Optimized HDD, sc1 for Cold" << endl; cout << " Provisioned IOPS SSD, st1 for Throughput Optimized HDD, sc1 for Cold" << endl;
cout << " HDD, or standard for Magnetic volumes." << endl << endl; cout << " HDD, or standard for Magnetic volumes." << endl;
UMStorageType = "external"; UMStorageType = "external";
@@ -4256,11 +4255,11 @@ bool storageSetup(bool amazonInstall)
{} {}
if ( UMVolumeType.empty() || UMVolumeType == "") if ( UMVolumeType.empty() || UMVolumeType == "")
UMVolumeType = "standard"; UMVolumeType = "gp2";
while(true) while(true)
{ {
string prompt = "Enter EBS Volume Type (standard, gp2, io1, sc1, st1) : (" + UMVolumeType + ") > "; string prompt = "Enter EBS Volume Type (gp2, io1, sc1, st1, standard) : (" + UMVolumeType + ") > ";
pcommand = callReadline(prompt); pcommand = callReadline(prompt);
if (pcommand) if (pcommand)
{ {
@@ -4587,9 +4586,9 @@ bool storageSetup(bool amazonInstall)
// if external and amazon, prompt for storage size // if external and amazon, prompt for storage size
if ( storageType == "2" && amazonInstall) if ( storageType == "2" && amazonInstall)
{ {
cout << "NOTE: The volume type. This can be gp2 for General Purpose SSD, io1 for" << endl; cout << endl << "NOTE: The volume type. This can be gp2 for General Purpose SSD, io1 for" << endl;
cout << " Provisioned IOPS SSD, st1 for Throughput Optimized HDD, sc1 for Cold" << endl; cout << " Provisioned IOPS SSD, st1 for Throughput Optimized HDD, sc1 for Cold" << endl;
cout << " HDD, or standard for Magnetic volumes." << endl << endl; cout << " HDD, or standard for Magnetic volumes." << endl;
cout << endl; cout << endl;
try { try {
@@ -4599,11 +4598,11 @@ bool storageSetup(bool amazonInstall)
{} {}
if ( PMVolumeType.empty() || PMVolumeType == "") if ( PMVolumeType.empty() || PMVolumeType == "")
PMVolumeType = "standard"; PMVolumeType = "gp2";
while(true) while(true)
{ {
string prompt = "Enter EBS Volume Type (standard, gp2, io1, sc1, st1) : (" + PMVolumeType + ") > "; string prompt = "Enter EBS Volume Type (gp2, io1, sc1, st1, standard) : (" + PMVolumeType + ") > ";
pcommand = callReadline(prompt); pcommand = callReadline(prompt);
if (pcommand) if (pcommand)
{ {