HBASE-2879 Offer ZK CLI outside of HBase Shell

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@979881 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -808,6 +808,8 @@ Release 0.21.0 - Unreleased
    HBASE-2830  NotServingRegionException shouldn't log a stack trace
    HBASE-2874  Unnecessary double-synchronization in ZooKeeperWrapper
                (Benoît Sigoure via Stack)
+   HBASE-2879  Offer ZK CLI outside of HBase Shell
+               (Nicolas Spiegelberg via Stack)
 
   NEW FEATURES
    HBASE-1961  HBase EC2 scripts

bin/hbase

@@ -67,6 +67,7 @@ if [ $# = 0 ]; then
   if $in_sources_dir; then
     echo "  shell-tests      run the HBase shell tests"
   fi
+  echo "  zkcli            run the ZooKeeper shell"
   echo "  master           run an HBase HMaster node" 
   echo "  regionserver     run an HBase HRegionServer node" 
   echo "  zookeeper        run a Zookeeper server"
@@ -259,6 +260,8 @@ elif [ "$COMMAND" = "zookeeper" ] ; then
   if [ "$1" != "stop" ] ; then
     HBASE_OPTS="$HBASE_OPTS $HBASE_ZOOKEEPER_OPTS"
   fi
+elif [ "$COMMAND" = "zkcli" ] ; then
+  CLASS='org.apache.zookeeper.ZooKeeperMain'
 else
   CLASS=$COMMAND
 fi

bin/hbase-config.sh

@@ -24,9 +24,9 @@
 # also should not be passed any arguments, since we need original $*
 # Modelled after $HADOOP_HOME/bin/hadoop-env.sh.
 
-# resolve links - $0 may be a softlink
+# resolve links - "${BASH_SOURCE-$0}" may be a softlink
 
-this="$0"
+this="${BASH_SOURCE-$0}"
 while [ -h "$this" ]; do
   ls=`ls -ld "$this"`
   link=`expr "$ls" : '.*-> \(.*\)$'`

bin/hbase-daemon.sh

@@ -42,7 +42,7 @@ if [ $# -le 1 ]; then
   exit 1
 fi
 
-bin=`dirname "$0"`
+bin=`dirname "${BASH_SOURCE-$0}"`
 bin=`cd "$bin">/dev/null; pwd`
 
 . "$bin"/hbase-config.sh

bin/hbase-daemons.sh

@@ -32,7 +32,7 @@ if [ $# -le 1 ]; then
   exit 1
 fi
 
-bin=`dirname "$0"`
+bin=`dirname "${BASH_SOURCE-$0}"`
 bin=`cd "$bin">/dev/null; pwd`
 
 . $bin/hbase-config.sh

bin/local-master-backup.sh

@@ -3,11 +3,11 @@
 # run it from hbase-dir/ just like 'bin/hbase'
 # Supports up to 10 masters (limitation = overlapping ports)
 
-bin=`dirname "$0"`
+bin=`dirname "${BASH_SOURCE-$0}"`
 bin=`cd "$bin" >/dev/null && pwd`
 
 if [ $# -lt 2 ]; then
-  S=`basename $0`
+  S=`basename "${BASH_SOURCE-$0}"`
   echo "Usage: $S [start|stop] offset(s)"
   echo ""
   echo "    e.g. $S start 1"

bin/local-regionservers.sh

@@ -3,11 +3,11 @@
 # run it from hbase-dir/ just like 'bin/hbase'
 # Supports up to 100 regionservers (limitation = overlapping ports)
 
-bin=`dirname "$0"`
+bin=`dirname "${BASH_SOURCE-$0}"`
 bin=`cd "$bin" >/dev/null && pwd`
 
 if [ $# -lt 2 ]; then
-  S=`basename $0`
+  S=`basename "${BASH_SOURCE-$0}"`
   echo "Usage: $S [start|stop] offset(s)"
   echo ""
   echo "    e.g. $S start 1 2"

bin/regionservers.sh

@@ -41,7 +41,7 @@ if [ $# -le 0 ]; then
   exit 1
 fi
 
-bin=`dirname "$0"`
+bin=`dirname "${BASH_SOURCE-$0}"`
 bin=`cd "$bin">/dev/null; pwd`
 
 . "$bin"/hbase-config.sh

bin/start-hbase.sh

@@ -26,7 +26,7 @@
 # Run this on master node.
 usage="Usage: start-hbase.sh"
 
-bin=`dirname "$0"`
+bin=`dirname "${BASH_SOURCE-$0}"`
 bin=`cd "$bin">/dev/null; pwd`
 
 . "$bin"/hbase-config.sh

bin/stop-hbase.sh

@@ -24,7 +24,7 @@
 
 # Stop hadoop hbase daemons.  Run this on master node.
 
-bin=`dirname "$0"`
+bin=`dirname "${BASH_SOURCE-$0}"`
 bin=`cd "$bin">/dev/null; pwd`
 
 . "$bin"/hbase-config.sh

bin/zookeepers.sh

@@ -38,7 +38,7 @@ if [ $# -le 0 ]; then
   exit 1
 fi
 
-bin=`dirname "$0"`
+bin=`dirname "${BASH_SOURCE-$0}"`
 bin=`cd "$bin">/dev/null; pwd`
 
 . "$bin"/hbase-config.sh