From c3ee52355d031e197a3ea6815442e92fcb434c92 Mon Sep 17 00:00:00 2001
From: Michael Stack <stack@apache.org>
Date: Fri, 7 Sep 2007 20:32:45 +0000
Subject: [PATCH] HADOOP-1835 Updated Documentation for HBase
 setup/installation

git-svn-id: https://svn.apache.org/repos/asf/lucene/hadoop/trunk/src/contrib/hbase@573691 13f79535-47bb-0310-9956-ffa450edef68
---
 CHANGES.txt         | 4 +++-
 bin/hbase-daemon.sh | 7 ++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 93f68b217e1..094aa3db1db 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -43,8 +43,10 @@ Trunk (unreleased changes)
     HADOOP-1793 (Phase 1) Remove TestHClient
     HADOOP-1794 Remove deprecated APIs
     HADOOP-1802 Startup scripts should wait until hdfs as cleared 'safe mode'
+    HADOOP-1833 bin/stop_hbase.sh returns before it completes
+                (Izaak Rubin via Stack) 
     HADOOP-1835 Updated Documentation for HBase setup/installation
-           (Izaak Rubin via Stack)
+                (Izaak Rubin via Stack)
 
 
 Below are the list of changes before 2007-08-18
diff --git a/bin/hbase-daemon.sh b/bin/hbase-daemon.sh
index 8b9b5f669c9..7dfc3bdb9b0 100755
--- a/bin/hbase-daemon.sh
+++ b/bin/hbase-daemon.sh
@@ -122,8 +122,13 @@ case $startStop in
   (stop)
     if [ -f $pid ]; then
       if kill -0 `cat $pid` > /dev/null 2>&1; then
-        echo stopping $command
+        echo -n stopping $command
         nohup nice -n $HADOOP_NICENESS "$HBASE_HOME"/bin/hbase --config="${HADOOP_CONF_DIR}" --hbaseconfig="${HBASE_CONF_DIR}" $command $startStop "$@" > "$log" 2>&1 < /dev/null &
+        while kill -0 `cat $pid` > /dev/null 2>&1; do
+          echo -n "."
+          sleep 1;
+        done
+        echo
       else
         echo no $command to stop
       fi