From dd1750de5528067fd375c3af8febc7e57b618ff0 Mon Sep 17 00:00:00 2001
From: david hill <david.hill@mariadb.com>
Date: Wed, 20 Jul 2016 09:46:50 -0500
Subject: [PATCH] mcol-5 add in exception returns when service is down

---
 oam/oamcpp/liboamcpp.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/oam/oamcpp/liboamcpp.cpp b/oam/oamcpp/liboamcpp.cpp
index 7d8bdd52a..401f93a86 100644
--- a/oam/oamcpp/liboamcpp.cpp
+++ b/oam/oamcpp/liboamcpp.cpp
@@ -1371,7 +1371,7 @@ namespace oam
 		string cmd = startup::StartUp::installDir() + "/bin/columnstore status > /tmp/status.log";
 		system(cmd.c_str());
 		if (!checkLogStatus("/tmp/status.log", "MariaDB Columnstore is running") ) 
-			return;
+			exceptionControl("getSystemStatus", API_FAILURE);
 
 #ifdef _MSC_VER
         // 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";
 		system(cmd.c_str());
 		if (!checkLogStatus("/tmp/status.log", "MariaDB Columnstore is running") ) 
-			return;
+			exceptionControl("getProcessStatus", API_FAILURE);
 
         ProcessStatus processstatus;
         systemprocessstatus.processstatus.clear();
@@ -2196,7 +2196,7 @@ namespace oam
 		string cmd = startup::StartUp::installDir() + "/bin/columnstore status > /tmp/status.log";
 		system(cmd.c_str());
 		if (!checkLogStatus("/tmp/status.log", "MariaDB Columnstore is running") ) 
-			return;
+			exceptionControl("getProcessStatus", API_FAILURE);
 
 	for ( int i = 0 ; i < 5 ; i ++)
 	{
@@ -2294,7 +2294,7 @@ namespace oam
 		string cmd = startup::StartUp::installDir() + "/bin/columnstore status > /tmp/status.log";
 		system(cmd.c_str());
 		if (!checkLogStatus("/tmp/status.log", "MariaDB Columnstore is running") ) 
-			return;
+			exceptionControl("setProcessStatus", API_FAILURE);
 
 		//send and wait for ack and resend if not received
 		//retry 5 time max
@@ -2814,7 +2814,7 @@ namespace oam
 		string cmd = startup::StartUp::installDir() + "/bin/columnstore status > /tmp/status.log";
 		system(cmd.c_str());
 		if (!checkLogStatus("/tmp/status.log", "MariaDB Columnstore is running") ) 
-			return NULL;
+			exceptionControl("getMyProcessStatus", API_FAILURE);
 
 	for ( int i = 0 ; i < 5 ; i ++)
 	{
@@ -4823,7 +4823,7 @@ namespace oam
 		string cmd = startup::StartUp::installDir() + "/bin/columnstore status > /tmp/status.log";
 		system(cmd.c_str());
 		if (!checkLogStatus("/tmp/status.log", "MariaDB Columnstore is running") ) 
-			return false;
+			exceptionControl("switchParentOAMModule", API_FAILURE);
 
 		int returnStatus;
 		// 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";
 		system(cmd.c_str());
 		if (!checkLogStatus("/tmp/status.log", "MariaDB Columnstore is running") ) 
-			return;
+			exceptionControl("setConfig", API_FAILURE);
 
 		//get updated Columnstore.xml distributed
 		distributeConfigFile("system");
@@ -6311,7 +6311,7 @@ namespace oam
 		string cmd = startup::StartUp::installDir() + "/bin/columnstore status > /tmp/status.log";
 		system(cmd.c_str());
 		if (!checkLogStatus("/tmp/status.log", "MariaDB Columnstore is running") ) 
-			return;
+			exceptionControl("distributeFstabUpdates", API_FAILURE);
 
 		ACK_FLAG ackflag = oam::ACK_YES;
 		// build and send msg