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

change amazon failover logic, make work like normal system

Browse Source
This commit is contained in:
david hill
2016-03-02 14:27:29 -06:00
parent f38cfc6480
commit 92bf40fcbb
6 changed files with 47 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
oamapps/postConfigure/postConfigure.cpp
View File

@@ -2132,7 +2132,7 @@ int main(int argc, char *argv[])
catch(...)
{}
prompt = "Enter Volume Name assigned to module '" + newModuleName + "' (" + volumeName + ") > ";
prompt = "Enter Volume ID assigned to module '" + newModuleName + "' (" + volumeName + ") > ";
pcommand = callReadline(prompt.c_str());
if (pcommand)
{
@@ -2140,7 +2140,7 @@ int main(int argc, char *argv[])
callFree(pcommand);
}
prompt = "Enter Device Name assigned to module '" + newModuleName + "' (" + deviceName + ") > ";
prompt = "Enter Device Name (/dev/sdxx) '" + newModuleName + "' (" + deviceName + ") > ";
pcommand = callReadline(prompt.c_str());
if (pcommand)
{
@@ -2409,7 +2409,7 @@ int main(int argc, char *argv[])
catch(...)
{}
prompt = "Enter Volume Name assigned to '" + DBrootID + "' (" + volumeName + ") > ";
prompt = "Enter Volume ID for '" + DBrootID + "' (" + volumeName + ") > ";
pcommand = callReadline(prompt.c_str());
if (pcommand)
{
@@ -2425,7 +2425,7 @@ int main(int argc, char *argv[])
catch(...)
{}
prompt = "Enter Device Name for volume '" + volumeName + "' (" + deviceName + ") > ";
prompt = "Enter Device Name (/dev/sdxx) for volume '" + volumeName + "' (" + deviceName + ") > ";
pcommand = callReadline(prompt.c_str());
if (pcommand)
{
@@ -4582,54 +4582,6 @@ bool storageSetup(string cloud)
}
}
if( DBRootStorageType == "external" && cloud == "amazon" )
{ //set AmazonPMFailover
string AmazonPMFailover = "y";
try {
AmazonPMFailover = sysConfig->getConfig(InstallSection, "AmazonPMFailover");
}
catch(...)
{}
cout << endl;
while(true)
{
pcommand = callReadline("Do you want to enable Instance failover support? [y,n] (" + AmazonPMFailover + ") > ");
if (pcommand)
{
if (strlen(pcommand) > 0) AmazonPMFailover = pcommand;
callFree(pcommand);
}
if ( AmazonPMFailover == "y" || AmazonPMFailover == "n" ) {
cout << endl;
break;
}
else
cout << "Invalid Entry, please enter 'y' for yes or 'n' for no" << endl;
if ( noPrompting )
exit(1);
}
try {
sysConfig->setConfig(InstallSection, "AmazonPMFailover", AmazonPMFailover);
}
catch(...)
{}
}
if( DBRootStorageType == "internal" && cloud == "amazon" )
{ //set AmazonPMFailover
try {
sysConfig->setConfig(InstallSection, "AmazonPMFailover", "n");
}
catch(...)
{}
}
if ( !writeConfig(sysConfig) ) {
cout << "ERROR: Failed trying to update InfiniDB System Configuration file" << endl;
return false;