From 4476cc196ccba86093029977d407fe7acd29bc59 Mon Sep 17 00:00:00 2001
From: Mike Drob <mdrob@apache.org>
Date: Fri, 12 Jan 2018 08:34:49 -0600
Subject: [PATCH] HBASE-19784 bin/stop-hbase more friendly when hbase already
 stopped

Signed-off-by: Michael Stack <stack@apache.org>
---
 bin/stop-hbase.sh | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/bin/stop-hbase.sh b/bin/stop-hbase.sh
index 8b81deedd82..4a196814589 100755
--- a/bin/stop-hbase.sh
+++ b/bin/stop-hbase.sh
@@ -44,17 +44,20 @@ logout=$HBASE_LOG_DIR/$HBASE_LOG_PREFIX.out
 loglog="${HBASE_LOG_DIR}/${HBASE_LOGFILE}"
 pid=${HBASE_PID_DIR:-/tmp}/hbase-$HBASE_IDENT_STRING-master.pid
 
-echo -n stopping hbase
-echo "`date` Stopping hbase (via master)" >> $loglog
+if [[ -e $pid ]]; then
+  echo -n stopping hbase
+  echo "`date` Stopping hbase (via master)" >> $loglog
 
-nohup nice -n ${HBASE_NICENESS:-0} "$HBASE_HOME"/bin/hbase \
-   --config "${HBASE_CONF_DIR}" \
-   master stop "$@" > "$logout" 2>&1 < /dev/null &
+  nohup nice -n ${HBASE_NICENESS:-0} "$HBASE_HOME"/bin/hbase \
+     --config "${HBASE_CONF_DIR}" \
+     master stop "$@" > "$logout" 2>&1 < /dev/null &
 
-waitForProcessEnd `cat $pid` 'stop-master-command'
-
-rm -f $pid
+  waitForProcessEnd `cat $pid` 'stop-master-command'
 
+  rm -f $pid
+else
+  echo no hbase master found
+fi
 
 # distributed == false means that the HMaster will kill ZK when it exits
 # HBASE-6504 - only take the first line of the output in case verbose gc is on