From 2275f4fd26448b12cfce302358dd97a6ef307e51 Mon Sep 17 00:00:00 2001
From: Andrew Hutchings <andrew@linuxjedi.co.uk>
Date: Tue, 19 Nov 2019 15:14:16 +0000
Subject: [PATCH] MCOL-3619 Fix multinode initial start on PM > 1

The new "columnstore stop" command doesn't work well if the cluster is
already down. Instead we need to use the older method to stop
ProcMon/ProcMgr on the node before starting it.
---
 oam/install_scripts/mcs_module_installer.sh.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/oam/install_scripts/mcs_module_installer.sh.in b/oam/install_scripts/mcs_module_installer.sh.in
index 90ed0fc2f..231c3c008 100644
--- a/oam/install_scripts/mcs_module_installer.sh.in
+++ b/oam/install_scripts/mcs_module_installer.sh.in
@@ -51,7 +51,7 @@ expect {
 send_user "\n"
 
 send_user "Stop ColumnStore service                       "
-send "ssh -v $USERNAME@$SERVER 'columnstore stop'\n"
+send "ssh -v $USERNAME@$SERVER 'pkill ProcMon; pkill ProcMgr'\n"
 set timeout 60
 # check return
 expect {
@@ -116,7 +116,7 @@ send_user "\n"
 
 send_user "Start ColumnStore service                       "
 send_user " \n"
-send "ssh -v $USERNAME@$SERVER 'columnstore restart'\n"
+send "ssh -v $USERNAME@$SERVER 'columnstore start'\n"
 set timeout 60
 # check return
 expect {