Index: bin/hbase =================================================================== --- bin/hbase (revision 1456519) +++ bin/hbase (working copy) @@ -248,74 +248,63 @@ # restore ordinary behaviour unset IFS -#Set the right GC options based on the what we are running -declare -a client_cmds=("shell" "hbck" "hlog" "hfile" "zkcli") -for cmd in ${client_cmds[@]}; do - if [[ $cmd == $COMMAND ]]; then - client=true - break - fi -done - -if [[ $client ]]; then - HBASE_OPTS="$HBASE_OPTS $CLIENT_GC_OPTS" -else - HBASE_OPTS="$HBASE_OPTS $SERVER_GC_OPTS" -fi - # figure out which class to run if [ "$COMMAND" = "shell" ] ; then # eg export JRUBY_HOME=/usr/local/share/jruby if [ "$JRUBY_HOME" != "" ] ; then CLASSPATH="$JRUBY_HOME/lib/jruby.jar:$CLASSPATH" - HBASE_OPTS="$HBASE_OPTS -Djruby.home=$JRUBY_HOME -Djruby.lib=$JRUBY_HOME/lib" + HBASE_OPTS="$HBASE_OPTS $CLIENT_GC_OPTS -Djruby.home=$JRUBY_HOME -Djruby.lib=$JRUBY_HOME/lib" fi CLASS="org.jruby.Main -X+O ${JRUBY_OPTS} ${HBASE_HOME}/bin/hirb.rb" elif [ "$COMMAND" = "hbck" ] ; then CLASS='org.apache.hadoop.hbase.util.HBaseFsck' + HBASE_OPTS="$HBASE_OPTS $CLIENT_GC_OPTS" elif [ "$COMMAND" = "hlog" ] ; then CLASS='org.apache.hadoop.hbase.regionserver.wal.HLogPrettyPrinter' + HBASE_OPTS="$HBASE_OPTS $CLIENT_GC_OPTS" elif [ "$COMMAND" = "hfile" ] ; then CLASS='org.apache.hadoop.hbase.io.hfile.HFile' + HBASE_OPTS="$HBASE_OPTS $CLIENT_GC_OPTS" elif [ "$COMMAND" = "zkcli" ] ; then # ZooKeeperMainServerArg returns '-server HOST:PORT' or empty string. SERVER_ARG=`"$bin"/hbase org.apache.hadoop.hbase.zookeeper.ZooKeeperMainServerArg` CLASS="org.apache.zookeeper.ZooKeeperMain ${SERVER_ARG}" + HBASE_OPTS="$HBASE_OPTS $CLIENT_GC_OPTS" elif [ "$COMMAND" = "master" ] ; then CLASS='org.apache.hadoop.hbase.master.HMaster' if [ "$1" != "stop" ] ; then - HBASE_OPTS="$HBASE_OPTS $HBASE_MASTER_OPTS" + HBASE_OPTS="$HBASE_OPTS $SERVER_GC_OPTS $HBASE_MASTER_OPTS" fi elif [ "$COMMAND" = "regionserver" ] ; then CLASS='org.apache.hadoop.hbase.regionserver.HRegionServer' if [ "$1" != "stop" ] ; then - HBASE_OPTS="$HBASE_OPTS $HBASE_REGIONSERVER_OPTS" + HBASE_OPTS="$HBASE_OPTS $SERVER_GC_OPTS $HBASE_REGIONSERVER_OPTS" fi elif [ "$COMMAND" = "thrift" ] ; then CLASS='org.apache.hadoop.hbase.thrift.ThriftServer' if [ "$1" != "stop" ] ; then - HBASE_OPTS="$HBASE_OPTS $HBASE_THRIFT_OPTS" + HBASE_OPTS="$HBASE_OPTS $SERVER_GC_OPTS $HBASE_THRIFT_OPTS" fi elif [ "$COMMAND" = "thrift2" ] ; then CLASS='org.apache.hadoop.hbase.thrift2.ThriftServer' if [ "$1" != "stop" ] ; then - HBASE_OPTS="$HBASE_OPTS $HBASE_THRIFT_OPTS" + HBASE_OPTS="$HBASE_OPTS $SERVER_GC_OPTS $HBASE_THRIFT_OPTS" fi elif [ "$COMMAND" = "rest" ] ; then CLASS='org.apache.hadoop.hbase.rest.Main' if [ "$1" != "stop" ] ; then - HBASE_OPTS="$HBASE_OPTS $HBASE_REST_OPTS" + HBASE_OPTS="$HBASE_OPTS $SERVER_GC_OPTS $HBASE_REST_OPTS" fi elif [ "$COMMAND" = "avro" ] ; then CLASS='org.apache.hadoop.hbase.avro.AvroServer' if [ "$1" != "stop" ] ; then - HBASE_OPTS="$HBASE_OPTS $HBASE_AVRO_OPTS" + HBASE_OPTS="$HBASE_OPTS $SERVER_GC_OPTS $HBASE_AVRO_OPTS" fi elif [ "$COMMAND" = "zookeeper" ] ; then CLASS='org.apache.hadoop.hbase.zookeeper.HQuorumPeer' if [ "$1" != "stop" ] ; then - HBASE_OPTS="$HBASE_OPTS $HBASE_ZOOKEEPER_OPTS" + HBASE_OPTS="$HBASE_OPTS $SERVER_GC_OPTS $HBASE_ZOOKEEPER_OPTS" fi elif [ "$COMMAND" = "classpath" ] ; then @@ -325,6 +314,7 @@ CLASS='org.apache.hadoop.hbase.util.VersionInfo' else CLASS=$COMMAND + HBASE_OPTS="$HBASE_OPTS $CLIENT_GC_OPTS" fi # Have JVM dump heap if we run out of memory. Files will be 'launch directory'