database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-11-03 17:13:17 +03:00
Code Activity

MCOL-462

Browse Source
This commit is contained in:
David Hill
2017-01-04 09:13:38 -06:00
parent 855c79b222
commit 2a8b29274f
2 changed files with 26 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
oam/cloud/MCSVolumeCmds.sh
View File

@@ -168,7 +168,7 @@ createvolume() {
#create volume #create volume
if [ $volumeType == "io1" ]; then if [ $volumeType == "io1" ]; then
volume=`$AWSCLI create-volume --availability-zone $zone --size $volumeSize --volume-type $volumeType -iops $volumeIOPS --output text --query VolumeId` volume=`$AWSCLI create-volume --availability-zone $zone --size $volumeSize --volume-type $volumeType --iops $volumeIOPS --output text --query VolumeId`
else else
volume=`$AWSCLI create-volume --availability-zone $zone --size $volumeSize --volume-type $volumeType --output text --query VolumeId` volume=`$AWSCLI create-volume --availability-zone $zone --size $volumeSize --volume-type $volumeType --output text --query VolumeId`
fi fi

29
oamapps/postConfigure/postConfigure.cpp
View File

@@ -4241,6 +4241,11 @@ bool storageSetup(bool amazonInstall)
UMStorageType = "internal"; UMStorageType = "internal";
else else
{ {
cout << "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 << " HDD, or standard for Magnetic volumes." << endl << endl;
UMStorageType = "external"; UMStorageType = "external";
cout << endl; cout << endl;
@@ -4255,7 +4260,7 @@ bool storageSetup(bool amazonInstall)
while(true) while(true)
{ {
string prompt = "Enter EBS Volume Type (standard, gp2, io1) : (" + UMVolumeType + ") > "; string prompt = "Enter EBS Volume Type (standard, gp2, io1, sc1, st1) : (" + UMVolumeType + ") > ";
pcommand = callReadline(prompt); pcommand = callReadline(prompt);
if (pcommand) if (pcommand)
{ {
@@ -4263,7 +4268,7 @@ bool storageSetup(bool amazonInstall)
callFree(pcommand); callFree(pcommand);
} }
if ( UMVolumeType == "standard" || UMVolumeType == "gp2" || UMVolumeType == "io1" ) if ( UMVolumeType == "standard" || UMVolumeType == "gp2" || UMVolumeType == "io1" || UMVolumeType == "sc1" || UMVolumeType == "st1")
break; break;
else else
{ {
@@ -4289,6 +4294,12 @@ bool storageSetup(bool amazonInstall)
if (UMVolumeType == "io1") if (UMVolumeType == "io1")
minSize = "4"; minSize = "4";
if (UMVolumeType == "sc1" || UMVolumeType == "st1")
minSize = "500";
if (UMVolumeType == "standard")
maxSize = "1024";
cout << endl; cout << endl;
try { try {
oam.getSystemConfig("UMVolumeSize", UMVolumeSize); oam.getSystemConfig("UMVolumeSize", UMVolumeSize);
@@ -4576,6 +4587,10 @@ 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 << " Provisioned IOPS SSD, st1 for Throughput Optimized HDD, sc1 for Cold" << endl;
cout << " HDD, or standard for Magnetic volumes." << endl << endl;
cout << endl; cout << endl;
try { try {
oam.getSystemConfig("PMVolumeType", PMVolumeType); oam.getSystemConfig("PMVolumeType", PMVolumeType);
@@ -4588,7 +4603,7 @@ bool storageSetup(bool amazonInstall)
while(true) while(true)
{ {
string prompt = "Enter EBS Volume Type (standard, gp2, io1) : (" + PMVolumeType + ") > "; string prompt = "Enter EBS Volume Type (standard, gp2, io1, sc1, st1) : (" + PMVolumeType + ") > ";
pcommand = callReadline(prompt); pcommand = callReadline(prompt);
if (pcommand) if (pcommand)
{ {
@@ -4596,7 +4611,7 @@ bool storageSetup(bool amazonInstall)
callFree(pcommand); callFree(pcommand);
} }
if ( PMVolumeType == "standard" || PMVolumeType == "gp2" || PMVolumeType == "io1" ) if ( PMVolumeType == "standard" || PMVolumeType == "gp2" || PMVolumeType == "io1" || PMVolumeType == "gp2" || PMVolumeType == "io1")
break; break;
else else
{ {
@@ -4632,6 +4647,12 @@ bool storageSetup(bool amazonInstall)
if (PMVolumeType == "io1") if (PMVolumeType == "io1")
minSize = "4"; minSize = "4";
if (PMVolumeType == "sc1" || PMVolumeType == "st1")
minSize = "500";
if (PMVolumeType == "standard")
maxSize = "1024";
while(true) while(true)
{ {
string prompt = "Enter EBS Volume storage size in GB: [" + minSize + "," + maxSize + "] (" + PMVolumeSize + ") > "; string prompt = "Enter EBS Volume storage size in GB: [" + minSize + "," + maxSize + "] (" + PMVolumeSize + ") > ";