database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-08-05 16:15:50 +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 ) if (systemstatus.SystemOpState == oam::ACTIVE )
{ {
try try
{ {
cout << endl << " Restarting System " << endl;
cout << endl << " Starting Modules" << endl; gracefulTemp = oam::FORCEFUL;
oam.startModule(devicenetworklist, ackTemp); int returnStatus = oam.restartSystem(gracefulTemp, ackTemp);
switch (returnStatus)
//reload DBRM with new configuration, needs to be done here after startModule {
cmd = installDir + "/bin/dbrmctl reload > /dev/null 2>&1"; case API_SUCCESS:
system(cmd.c_str()); if ( waitForActive() )
sleep(15); cout << endl << " Successful restart of System " << endl << endl;
else
cout << " Successful start of Modules " << endl; cout << endl << "**** restartSystem Failed : check log files" << endl;
break;
} case API_CANCELLED:
catch (exception& e) cout << endl << " Restart of System canceled" << endl << endl;
{ break;
cout << endl << "**** startModule Failed : " << e.what() << endl; default:
break; cout << endl << "**** restartSystem Failed : Check system logs" << endl;
} break;
}
}
catch (exception& e)
{
cout << endl << "**** restartSystem Failed : " << e.what() << endl;
break;
}
} }
else else
cout << endl << " System not Active, run 'startSystem' to start system if needed" << endl; cout << endl << " System not Active, run 'startSystem' to start system if needed" << endl;