You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2010/07/27 23:50:05 UTC
svn commit: r979881 - in /hbase/trunk: CHANGES.txt bin/hbase
bin/hbase-config.sh bin/hbase-daemon.sh bin/hbase-daemons.sh
bin/local-master-backup.sh bin/local-regionservers.sh bin/regionservers.sh
bin/start-hbase.sh bin/stop-hbase.sh bin/zookeepers.sh
Author: stack
Date: Tue Jul 27 21:50:05 2010
New Revision: 979881
URL: http://svn.apache.org/viewvc?rev=979881&view=rev
Log:
HBASE-2879 Offer ZK CLI outside of HBase Shell
Modified:
hbase/trunk/CHANGES.txt
hbase/trunk/bin/hbase
hbase/trunk/bin/hbase-config.sh
hbase/trunk/bin/hbase-daemon.sh
hbase/trunk/bin/hbase-daemons.sh
hbase/trunk/bin/local-master-backup.sh
hbase/trunk/bin/local-regionservers.sh
hbase/trunk/bin/regionservers.sh
hbase/trunk/bin/start-hbase.sh
hbase/trunk/bin/stop-hbase.sh
hbase/trunk/bin/zookeepers.sh
Modified: hbase/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hbase/trunk/CHANGES.txt?rev=979881&r1=979880&r2=979881&view=diff
==============================================================================
--- hbase/trunk/CHANGES.txt (original)
+++ hbase/trunk/CHANGES.txt Tue Jul 27 21:50:05 2010
@@ -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
Modified: hbase/trunk/bin/hbase
URL: http://svn.apache.org/viewvc/hbase/trunk/bin/hbase?rev=979881&r1=979880&r2=979881&view=diff
==============================================================================
--- hbase/trunk/bin/hbase (original)
+++ hbase/trunk/bin/hbase Tue Jul 27 21:50:05 2010
@@ -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
Modified: hbase/trunk/bin/hbase-config.sh
URL: http://svn.apache.org/viewvc/hbase/trunk/bin/hbase-config.sh?rev=979881&r1=979880&r2=979881&view=diff
==============================================================================
--- hbase/trunk/bin/hbase-config.sh (original)
+++ hbase/trunk/bin/hbase-config.sh Tue Jul 27 21:50:05 2010
@@ -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" : '.*-> \(.*\)$'`
Modified: hbase/trunk/bin/hbase-daemon.sh
URL: http://svn.apache.org/viewvc/hbase/trunk/bin/hbase-daemon.sh?rev=979881&r1=979880&r2=979881&view=diff
==============================================================================
--- hbase/trunk/bin/hbase-daemon.sh (original)
+++ hbase/trunk/bin/hbase-daemon.sh Tue Jul 27 21:50:05 2010
@@ -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
Modified: hbase/trunk/bin/hbase-daemons.sh
URL: http://svn.apache.org/viewvc/hbase/trunk/bin/hbase-daemons.sh?rev=979881&r1=979880&r2=979881&view=diff
==============================================================================
--- hbase/trunk/bin/hbase-daemons.sh (original)
+++ hbase/trunk/bin/hbase-daemons.sh Tue Jul 27 21:50:05 2010
@@ -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
Modified: hbase/trunk/bin/local-master-backup.sh
URL: http://svn.apache.org/viewvc/hbase/trunk/bin/local-master-backup.sh?rev=979881&r1=979880&r2=979881&view=diff
==============================================================================
--- hbase/trunk/bin/local-master-backup.sh (original)
+++ hbase/trunk/bin/local-master-backup.sh Tue Jul 27 21:50:05 2010
@@ -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"
Modified: hbase/trunk/bin/local-regionservers.sh
URL: http://svn.apache.org/viewvc/hbase/trunk/bin/local-regionservers.sh?rev=979881&r1=979880&r2=979881&view=diff
==============================================================================
--- hbase/trunk/bin/local-regionservers.sh (original)
+++ hbase/trunk/bin/local-regionservers.sh Tue Jul 27 21:50:05 2010
@@ -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"
Modified: hbase/trunk/bin/regionservers.sh
URL: http://svn.apache.org/viewvc/hbase/trunk/bin/regionservers.sh?rev=979881&r1=979880&r2=979881&view=diff
==============================================================================
--- hbase/trunk/bin/regionservers.sh (original)
+++ hbase/trunk/bin/regionservers.sh Tue Jul 27 21:50:05 2010
@@ -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
Modified: hbase/trunk/bin/start-hbase.sh
URL: http://svn.apache.org/viewvc/hbase/trunk/bin/start-hbase.sh?rev=979881&r1=979880&r2=979881&view=diff
==============================================================================
--- hbase/trunk/bin/start-hbase.sh (original)
+++ hbase/trunk/bin/start-hbase.sh Tue Jul 27 21:50:05 2010
@@ -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
Modified: hbase/trunk/bin/stop-hbase.sh
URL: http://svn.apache.org/viewvc/hbase/trunk/bin/stop-hbase.sh?rev=979881&r1=979880&r2=979881&view=diff
==============================================================================
--- hbase/trunk/bin/stop-hbase.sh (original)
+++ hbase/trunk/bin/stop-hbase.sh Tue Jul 27 21:50:05 2010
@@ -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
Modified: hbase/trunk/bin/zookeepers.sh
URL: http://svn.apache.org/viewvc/hbase/trunk/bin/zookeepers.sh?rev=979881&r1=979880&r2=979881&view=diff
==============================================================================
--- hbase/trunk/bin/zookeepers.sh (original)
+++ hbase/trunk/bin/zookeepers.sh Tue Jul 27 21:50:05 2010
@@ -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