database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-08-01 06:46:55 +03:00
Code Activity

fix merge issue in 1.2.1

Browse Source
This commit is contained in:
David Hill
2018-11-09 10:45:51 -06:00
parent f134f05771
commit e587adac36
1 changed files with 26 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
oamapps/mcsadmin/mcsadmin.cpp
View File

@ -7863,25 +7863,32 @@ int processCommand(string* arguments)
{
if (systemstatus.SystemOpState == oam::ACTIVE )
{
try
{
cout << endl << " Starting Modules" << endl;
oam.startModule(devicenetworklist, ackTemp);
//reload DBRM with new configuration, needs to be done here after startModule
cmd = installDir + "/bin/dbrmctl reload > /dev/null 2>&1";
system(cmd.c_str());
sleep(15);
cout << " Successful start of Modules " << endl;
}
catch (exception& e)
{
cout << endl << "**** startModule Failed : " << e.what() << endl;
break;
}
try
{
cout << endl << " Restarting System " << endl;
gracefulTemp = oam::FORCEFUL;
int returnStatus = oam.restartSystem(gracefulTemp, ackTemp);
switch (returnStatus)
{
case API_SUCCESS:
if ( waitForActive() )
cout << endl << " Successful restart of System " << endl << endl;
else
cout << endl << "**** restartSystem Failed : check log files" << endl;
break;
case API_CANCELLED:
cout << endl << " Restart of System canceled" << endl << endl;
break;
default:
cout << endl << "**** restartSystem Failed : Check system logs" << endl;
break;
}
}
catch (exception& e)
{
cout << endl << "**** restartSystem Failed : " << e.what() << endl;
break;
}
}
else
cout << endl << " System not Active, run 'startSystem' to start system if needed" << endl;