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

fix disk size prompt

Browse Source
This commit is contained in:
david hill
2016-04-21 13:11:55 -05:00
parent 8f90715709
commit 154aa8ccc5
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
oam/oamcpp/liboamcpp.cpp
View File

@@ -8478,8 +8478,7 @@ namespace oam
std::string Oam::updateFstab(std::string device, std::string dbrootID) std::string Oam::updateFstab(std::string device, std::string dbrootID)
{ {
//check if entry already exist //check if entry already exist
string cmd = "grep /data" + dbrootID + " > /etc/fstab /dev/null 2>&1"; string cmd = "grep /data" + dbrootID + " /etc/fstab /dev/null 2>&1";
int status = system(cmd.c_str()); int status = system(cmd.c_str());
if (WEXITSTATUS(status) == 0 ) if (WEXITSTATUS(status) == 0 )
return ""; return "";

8
oamapps/postConfigure/postConfigure.cpp
View File

@@ -2317,10 +2317,10 @@ int main(int argc, char *argv[])
if ( !found ) if ( !found )
{ {
cout << "Invalid Entry, Module pm1 has to have dbroot #1 assigned to it, please re-enter" << endl; cout << endl << "Invalid Entry, Module pm1 has to have dbroot #1 assigned to it, please re-enter" << endl;
if ( noPrompting ) if ( noPrompting )
exit(1); exit(1);
break; continue;
} }
} }
@@ -2434,7 +2434,7 @@ int main(int argc, char *argv[])
//get EC2 volume name and info //get EC2 volume name and info
if ( DBRootStorageType == "external" && cloud == "amazon") { if ( DBRootStorageType == "external" && cloud == "amazon") {
cout << endl << "*** Setup External EBS Storage for dbroot #" << *it << " ***" << endl; cout << endl << "*** Setup External EBS Volume for dbroot #" << *it << " ***" << endl;
cout << "*** NOTE: You can either have postConfigure create a new EBS volume or you can provide an existing Volume ID to use" << endl << endl; cout << "*** NOTE: You can either have postConfigure create a new EBS volume or you can provide an existing Volume ID to use" << endl << endl;
string volumeNameID = "PMVolumeName" + *it; string volumeNameID = "PMVolumeName" + *it;
@@ -2457,7 +2457,7 @@ int main(int argc, char *argv[])
while(true) while(true)
{ {
pcommand = callReadline("Create a new EBS volume? [y,n] (y) > "); pcommand = callReadline("Create a new EBS volume for dbroot #" + *it + " ? [y,n] (y) > ");
if (pcommand) if (pcommand)
{ {
if (strlen(pcommand) > 0) create = pcommand; if (strlen(pcommand) > 0) create = pcommand;