From f700187546f637299c7fe4b89ad492f4dfc03208 Mon Sep 17 00:00:00 2001
From: Jean-Daniel Cryans <jdcryans@apache.org>
Date: Fri, 22 Jan 2010 19:26:09 +0000
Subject: [PATCH] HBASE-2057  Cluster won't stop (Gary Helmling and JD via JD)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/hbase/trunk@902239 13f79535-47bb-0310-9956-ffa450edef68
---
 CHANGES.txt |  2 +-
 bin/hbase   | 16 ++++++++++++----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 80cb02f08ad..53e02f7c439 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -135,7 +135,6 @@ Release 0.21.0 - Unreleased
    HBASE-1960  Master should wait for DFS to come up when creating
                hbase.version
    HBASE-2054  memstore size 0 is >= than blocking -2.0g size
-   HBASE-2057  Cluster won't stop
    HBASE-2064  Cannot disable a table if at the same the Master is moving 
                its regions around
    HBASE-2065  Cannot disable a table if any of its region is opening 
@@ -189,6 +188,7 @@ Release 0.21.0 - Unreleased
    HBASE-2152  Add default jmxremote.{access|password} files into conf
                (Lars George and Gary Helmling via Stack)
    HBASE-2156  HBASE-2037 broke Scan - only a test for trunk
+   HBASE-2057  Cluster won't stop (Gary Helmling and JD via JD)
 
   IMPROVEMENTS
    HBASE-1760  Cleanup TODOs in HTable
diff --git a/bin/hbase b/bin/hbase
index aa0a8c71272..ebd09d8bea5 100755
--- a/bin/hbase
+++ b/bin/hbase
@@ -173,18 +173,26 @@ if [ "$COMMAND" = "shell" ] ; then
   CLASS="org.jruby.Main ${HBASE_HOME}/bin/hirb.rb"
 elif [ "$COMMAND" = "master" ] ; then
   CLASS='org.apache.hadoop.hbase.master.HMaster'
-  HBASE_OPTS="$HBASE_OPTS $HBASE_MASTER_OPTS"
+  if [ "$1" != "stop" ] ; then
+    HBASE_OPTS="$HBASE_OPTS $HBASE_MASTER_OPTS"
+  fi
 elif [ "$COMMAND" = "regionserver" ] ; then
   CLASS='org.apache.hadoop.hbase.regionserver.HRegionServer'
-  HBASE_OPTS="$HBASE_OPTS $HBASE_REGIONSERVER_OPTS"
+  if [ "$1" != "stop" ] ; then
+    HBASE_OPTS="$HBASE_OPTS $HBASE_REGIONSERVER_OPTS"
+  fi
 elif [ "$COMMAND" = "thrift" ] ; then
   CLASS='org.apache.hadoop.hbase.thrift.ThriftServer'
-  HBASE_OPTS="$HBASE_OPTS $HBASE_THRIFT_OPTS"
+  if [ "$1" != "stop" ] ; then
+    HBASE_OPTS="$HBASE_OPTS $HBASE_THRIFT_OPTS"
+  fi
 elif [ "$COMMAND" = "migrate" ] ; then
   CLASS='org.apache.hadoop.hbase.util.Migrate'
 elif [ "$COMMAND" = "zookeeper" ] ; then
   CLASS='org.apache.hadoop.hbase.zookeeper.HQuorumPeer'
-  HBASE_OPTS="$HBASE_OPTS $HBASE_ZOOKEEPER_OPTS"
+  if [ "$1" != "stop" ] ; then
+    HBASE_OPTS="$HBASE_OPTS $HBASE_ZOOKEEPER_OPTS"
+  fi
 else
   CLASS=$COMMAND
 fi