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

mcol-5 add in exception returns when service is down

Browse Source
This commit is contained in:
david hill
2016-07-20 09:46:50 -05:00
parent edb55cf23a
commit dd1750de55
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
oam/oamcpp/liboamcpp.cpp
View File

@ -1371,7 +1371,7 @@ namespace oam
string cmd = startup::StartUp::installDir() + "/bin/columnstore status > /tmp/status.log"; string cmd = startup::StartUp::installDir() + "/bin/columnstore status > /tmp/status.log";
system(cmd.c_str()); system(cmd.c_str());
if (!checkLogStatus("/tmp/status.log", "MariaDB Columnstore is running") ) if (!checkLogStatus("/tmp/status.log", "MariaDB Columnstore is running") )
return; exceptionControl("getSystemStatus", API_FAILURE);
#ifdef _MSC_VER #ifdef _MSC_VER
// TODO: Remove when we create OAM for Windows // TODO: Remove when we create OAM for Windows
@ -2093,7 +2093,7 @@ namespace oam
string cmd = startup::StartUp::installDir() + "/bin/columnstore status > /tmp/status.log"; string cmd = startup::StartUp::installDir() + "/bin/columnstore status > /tmp/status.log";
system(cmd.c_str()); system(cmd.c_str());
if (!checkLogStatus("/tmp/status.log", "MariaDB Columnstore is running") ) if (!checkLogStatus("/tmp/status.log", "MariaDB Columnstore is running") )
return; exceptionControl("getProcessStatus", API_FAILURE);
ProcessStatus processstatus; ProcessStatus processstatus;
systemprocessstatus.processstatus.clear(); systemprocessstatus.processstatus.clear();
@ -2196,7 +2196,7 @@ namespace oam
string cmd = startup::StartUp::installDir() + "/bin/columnstore status > /tmp/status.log"; string cmd = startup::StartUp::installDir() + "/bin/columnstore status > /tmp/status.log";
system(cmd.c_str()); system(cmd.c_str());
if (!checkLogStatus("/tmp/status.log", "MariaDB Columnstore is running") ) if (!checkLogStatus("/tmp/status.log", "MariaDB Columnstore is running") )
return; exceptionControl("getProcessStatus", API_FAILURE);
for ( int i = 0 ; i < 5 ; i ++) for ( int i = 0 ; i < 5 ; i ++)
{ {
@ -2294,7 +2294,7 @@ namespace oam
string cmd = startup::StartUp::installDir() + "/bin/columnstore status > /tmp/status.log"; string cmd = startup::StartUp::installDir() + "/bin/columnstore status > /tmp/status.log";
system(cmd.c_str()); system(cmd.c_str());
if (!checkLogStatus("/tmp/status.log", "MariaDB Columnstore is running") ) if (!checkLogStatus("/tmp/status.log", "MariaDB Columnstore is running") )
return; exceptionControl("setProcessStatus", API_FAILURE);
//send and wait for ack and resend if not received //send and wait for ack and resend if not received
//retry 5 time max //retry 5 time max
@ -2814,7 +2814,7 @@ namespace oam
string cmd = startup::StartUp::installDir() + "/bin/columnstore status > /tmp/status.log"; string cmd = startup::StartUp::installDir() + "/bin/columnstore status > /tmp/status.log";
system(cmd.c_str()); system(cmd.c_str());
if (!checkLogStatus("/tmp/status.log", "MariaDB Columnstore is running") ) if (!checkLogStatus("/tmp/status.log", "MariaDB Columnstore is running") )
return NULL; exceptionControl("getMyProcessStatus", API_FAILURE);
for ( int i = 0 ; i < 5 ; i ++) for ( int i = 0 ; i < 5 ; i ++)
{ {
@ -4823,7 +4823,7 @@ namespace oam
string cmd = startup::StartUp::installDir() + "/bin/columnstore status > /tmp/status.log"; string cmd = startup::StartUp::installDir() + "/bin/columnstore status > /tmp/status.log";
system(cmd.c_str()); system(cmd.c_str());
if (!checkLogStatus("/tmp/status.log", "MariaDB Columnstore is running") ) if (!checkLogStatus("/tmp/status.log", "MariaDB Columnstore is running") )
return false; exceptionControl("switchParentOAMModule", API_FAILURE);
int returnStatus; int returnStatus;
// We assume that moduleName is a valid pm // We assume that moduleName is a valid pm
@ -6269,7 +6269,7 @@ namespace oam
string cmd = startup::StartUp::installDir() + "/bin/columnstore status > /tmp/status.log"; string cmd = startup::StartUp::installDir() + "/bin/columnstore status > /tmp/status.log";
system(cmd.c_str()); system(cmd.c_str());
if (!checkLogStatus("/tmp/status.log", "MariaDB Columnstore is running") ) if (!checkLogStatus("/tmp/status.log", "MariaDB Columnstore is running") )
return; exceptionControl("setConfig", API_FAILURE);
//get updated Columnstore.xml distributed //get updated Columnstore.xml distributed
distributeConfigFile("system"); distributeConfigFile("system");
@ -6311,7 +6311,7 @@ namespace oam
string cmd = startup::StartUp::installDir() + "/bin/columnstore status > /tmp/status.log"; string cmd = startup::StartUp::installDir() + "/bin/columnstore status > /tmp/status.log";
system(cmd.c_str()); system(cmd.c_str());
if (!checkLogStatus("/tmp/status.log", "MariaDB Columnstore is running") ) if (!checkLogStatus("/tmp/status.log", "MariaDB Columnstore is running") )
return; exceptionControl("distributeFstabUpdates", API_FAILURE);
ACK_FLAG ackflag = oam::ACK_YES; ACK_FLAG ackflag = oam::ACK_YES;
// build and send msg // build and send msg