Browse Source

HADOOP-1835 Updated Documentation for HBase setup/installation

git-svn-id: https://svn.apache.org/repos/asf/lucene/hadoop/trunk@573691 13f79535-47bb-0310-9956-ffa450edef68
Michael Stack 18 years ago
parent
commit
a865d8b9f0
2 changed files with 9 additions and 2 deletions
  1. 3 1
      src/contrib/hbase/CHANGES.txt
  2. 6 1
      src/contrib/hbase/bin/hbase-daemon.sh

+ 3 - 1
src/contrib/hbase/CHANGES.txt

@@ -43,8 +43,10 @@ Trunk (unreleased changes)
     HADOOP-1793 (Phase 1) Remove TestHClient
     HADOOP-1793 (Phase 1) Remove TestHClient
     HADOOP-1794 Remove deprecated APIs
     HADOOP-1794 Remove deprecated APIs
     HADOOP-1802 Startup scripts should wait until hdfs as cleared 'safe mode'
     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
     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
 Below are the list of changes before 2007-08-18

+ 6 - 1
src/contrib/hbase/bin/hbase-daemon.sh

@@ -122,8 +122,13 @@ case $startStop in
   (stop)
   (stop)
     if [ -f $pid ]; then
     if [ -f $pid ]; then
       if kill -0 `cat $pid` > /dev/null 2>&1; 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 &
         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
       else
         echo no $command to stop
         echo no $command to stop
       fi
       fi