From edd8a30142435d6c61345e45fb49ed8977dda197 Mon Sep 17 00:00:00 2001
From: David Hall <david.hall@mariadb.com>
Date: Fri, 20 Jan 2017 13:35:13 -0600
Subject: [PATCH] MCOL-455 Add check for system running to prevent mcsadmin
 crash

---
 oamapps/mcsadmin/mcsadmin.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/oamapps/mcsadmin/mcsadmin.cpp b/oamapps/mcsadmin/mcsadmin.cpp
index 00b8efbeb..af556ec47 100644
--- a/oamapps/mcsadmin/mcsadmin.cpp
+++ b/oamapps/mcsadmin/mcsadmin.cpp
@@ -719,6 +719,11 @@ int processCommand(string* arguments)
 			vector<uint32_t> srcDbroots;    // all of the currently configured dbroots
 			vector<uint32_t> destDbroots;   // srcDbroots - removeDbroots
 			set<int>::iterator dbiter;
+			if (!oam.checkSystemRunning())
+			{
+				cout << "Mariadb ColumnStore is not running" << endl;
+				break;
+			}
 			if (arguments[1] == "start")
 			{
 				// Get a list of all the configured dbroots in the xml file.