You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by la...@apache.org on 2013/03/14 19:11:10 UTC

svn commit: r1456580 - /hbase/branches/0.94/bin/hbase

Author: larsh
Date: Thu Mar 14 18:11:10 2013
New Revision: 1456580

URL: http://svn.apache.org/r1456580
Log:
HBASE-8025  zkcli fails when SERVER_GC_OPTS is enabled (Dave Latham)

Modified:
    hbase/branches/0.94/bin/hbase

Modified: hbase/branches/0.94/bin/hbase
URL: http://svn.apache.org/viewvc/hbase/branches/0.94/bin/hbase?rev=1456580&r1=1456579&r2=1456580&view=diff
==============================================================================
--- hbase/branches/0.94/bin/hbase (original)
+++ hbase/branches/0.94/bin/hbase Thu Mar 14 18:11:10 2013
@@ -249,18 +249,18 @@ fi
 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
+declare -a server_cmds=("master" "regionserver" "thrift" "thrift2" "rest" "avro" "zookeeper")
+for cmd in ${server_cmds[@]}; do
 	if [[ $cmd == $COMMAND ]]; then
-		client=true
+		server=true
 		break
 	fi
 done
 
-if [[ $client ]]; then
-	HBASE_OPTS="$HBASE_OPTS $CLIENT_GC_OPTS"
-else
+if [[ $server ]]; then
 	HBASE_OPTS="$HBASE_OPTS $SERVER_GC_OPTS"
+else
+	HBASE_OPTS="$HBASE_OPTS $CLIENT_GC_OPTS"
 fi
 
 # figure out which class to run