diff --git bin/hbase bin/hbase index ebcc9df..87924a8 100755 --- bin/hbase +++ bin/hbase @@ -71,6 +71,9 @@ fi COMMAND=$1 shift +ACTION=$1 +shift + # Source the hbase-env.sh. Will have JAVA_HOME defined. if [ -f "${HBASE_CONF_DIR}/hbase-env.sh" ]; then . "${HBASE_CONF_DIR}/hbase-env.sh" @@ -187,18 +190,26 @@ if [ "$COMMAND" = "shell" ] ; then CLASS="org.jruby.Main ${HBASE_HOME}/bin/hirb.rb" elif [ "$COMMAND" = "master" ] ; then CLASS='org.apache.hadoop.hbase.master.HMaster' - HBASE_OPTS="$HBASE_OPTS $HBASE_MASTER_OPTS" + if [ "$ACTION" = "start" ] ; then + HBASE_OPTS="$HBASE_OPTS $HBASE_MASTER_OPTS" + fi elif [ "$COMMAND" = "regionserver" ] ; then CLASS='org.apache.hadoop.hbase.regionserver.HRegionServer' - HBASE_OPTS="$HBASE_OPTS $HBASE_REGIONSERVER_OPTS" + if [ "$ACTION" = "start" ] ; then + HBASE_OPTS="$HBASE_OPTS $HBASE_REGIONSERVER_OPTS" + fi elif [ "$COMMAND" = "thrift" ] ; then CLASS='org.apache.hadoop.hbase.thrift.ThriftServer' - HBASE_OPTS="$HBASE_OPTS $HBASE_THRIFT_OPTS" + if [ "$ACTION" = "start" ] ; then + HBASE_OPTS="$HBASE_OPTS $HBASE_THRIFT_OPTS" + fi elif [ "$COMMAND" = "migrate" ] ; then CLASS='org.apache.hadoop.hbase.util.Migrate' elif [ "$COMMAND" = "zookeeper" ] ; then CLASS='org.apache.hadoop.hbase.zookeeper.HQuorumPeer' - HBASE_OPTS="$HBASE_OPTS $HBASE_ZOOKEEPER_OPTS" + if [ "$ACTION" = "start" ] ; then + HBASE_OPTS="$HBASE_OPTS $HBASE_ZOOKEEPER_OPTS" + fi else CLASS=$COMMAND fi @@ -217,4 +228,4 @@ if [ "x$JAVA_LIBRARY_PATH" != "x" ]; then fi # run it -exec "$JAVA" $JAVA_HEAP_MAX $HBASE_OPTS -classpath "$CLASSPATH" $CLASS "$@" +exec "$JAVA" $JAVA_HEAP_MAX $HBASE_OPTS -classpath "$CLASSPATH" $CLASS $ACTION "$@"