database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-12-24 14:20:59 +03:00
Code Activity

more fixes to adddbroot from postConfigure

Browse Source
This commit is contained in:
david hill
2016-04-19 11:10:47 -05:00
parent ecb5278b02
commit 9a52f3955c
1 changed files with 56 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

100
oamapps/postConfigure/postConfigure.cpp
View File

@@ -2472,25 +2472,6 @@ int main(int argc, char *argv[])
if ( DBRootStorageType == "external" && cloud == "amazon") {
cout << endl;
string create = "y";
while(true)
{
pcommand = callReadline("Do you need the volume created [y,n] (y) > ");
if (pcommand)
{
if (strlen(pcommand) > 0) create = pcommand;
callFree(pcommand);
}
if ( create == "y" || create == "n" )
break;
else
cout << "Invalid Entry, please enter 'y' for yes or 'n' for no" << endl;
create = "y";
if ( noPrompting )
exit(1);
}
string volumeNameID = "PMVolumeName" + *it;
string volumeName = oam::UnassignedName;
string deviceNameID = "PMVolumeDeviceName" + *it;
@@ -2502,7 +2483,62 @@ int main(int argc, char *argv[])
catch(...)
{}
if ( create == "n" ) {
if ( reuseConfig == "n" ) {
string create = "y";
while(true)
{
pcommand = callReadline("Do you need the volume created [y,n] (y) > ");
if (pcommand)
{
if (strlen(pcommand) > 0) create = pcommand;
callFree(pcommand);
}
if ( create == "y" || create == "n" )
break;
else
cout << "Invalid Entry, please enter 'y' for yes or 'n' for no" << endl;
create = "y";
if ( noPrompting )
exit(1);
}
if ( create == "n" ) {
prompt = "Enter Volume ID for '" + DBrootID + "' (" + volumeName + ") > ";
pcommand = callReadline(prompt.c_str());
if (pcommand)
{
if (strlen(pcommand) > 0) volumeName = pcommand;
callFree(pcommand);
}
}
else
{
// create amazon ebs dbroot
try
{
DBRootConfigList dbrootlist;
dbrootlist.push_back(atoi((*it).c_str()));
oam.addDbroot(1, dbrootlist, PMVolumeSize);
sleep(2);
try {
volumeName = sysConfig->getConfig(InstallSection, volumeNameID);
deviceName = sysConfig->getConfig(InstallSection, deviceNameID);
}
catch(...)
{}
}
catch (exception& e)
{
cout << endl << "**** addDbroot Failed: " << e.what() << endl;
exit(1);
}
}
}
else
{
prompt = "Enter Volume ID for '" + DBrootID + "' (" + volumeName + ") > ";
pcommand = callReadline(prompt.c_str());
if (pcommand)
@@ -2511,30 +2547,6 @@ int main(int argc, char *argv[])
callFree(pcommand);
}
}
else
{
// create amazon ebs dbroot
try
{
DBRootConfigList dbrootlist;
dbrootlist.push_back(atoi((*it).c_str()));
oam.addDbroot(1, dbrootlist, PMVolumeSize);
sleep(2);
try {
volumeName = sysConfig->getConfig(InstallSection, volumeNameID);
deviceName = sysConfig->getConfig(InstallSection, deviceNameID);
}
catch(...)
{}
}
catch (exception& e)
{
cout << endl << "**** addDbroot Failed: " << e.what() << endl;
exit(1);
}
}
//write volume and device name
try {