diff --git bin/hbase bin/hbase index f4722ac..05adc99 100755 --- bin/hbase +++ bin/hbase @@ -86,7 +86,7 @@ if [ $# = 0 ]; then echo " snapshotinfo Tool for dumping snapshot information" echo " wal Write-ahead-log analyzer" echo " hfile Store file analyzer" - echo " zkcli Run the ZooKeeper shell" + echo " zkcli Run the ZooKeeper shell (Optional argument: --auth-as-server)" echo " upgrade Upgrade hbase" echo " master Run an HBase HMaster node" echo " regionserver Run an HBase HRegionServer node" @@ -297,6 +297,7 @@ if [ "$COMMAND" = "shell" ] ; then HBASE_OPTS="$HBASE_OPTS $HBASE_SHELL_OPTS" CLASS="org.jruby.Main -X+O ${JRUBY_OPTS} ${HBASE_HOME}/bin/hirb.rb" elif [ "$COMMAND" = "hbck" ] ; then + HBASE_OPTS="$HBASE_OPTS $HBASE_REGIONSERVER_OPTS" CLASS='org.apache.hadoop.hbase.util.HBaseFsck' # TODO remove old 'hlog' version elif [ "$COMMAND" = "hlog" -o "$COMMAND" = "wal" ] ; then @@ -304,6 +305,10 @@ elif [ "$COMMAND" = "hlog" -o "$COMMAND" = "wal" ] ; then elif [ "$COMMAND" = "hfile" ] ; then CLASS='org.apache.hadoop.hbase.io.hfile.HFilePrettyPrinter' elif [ "$COMMAND" = "zkcli" ] ; then + if [ "$1" == "--auth-as-server" ] ; then + HBASE_OPTS="$HBASE_OPTS $HBASE_REGIONSERVER_OPTS" + shift + fi CLASS="org.apache.hadoop.hbase.zookeeper.ZooKeeperMainServer" elif [ "$COMMAND" = "upgrade" ] ; then CLASS="org.apache.hadoop.hbase.migration.UpgradeTo96"