You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@hbase.apache.org by ns...@apache.org on 2011/10/11 03:59:58 UTC

svn commit: r1181337 - /hbase/branches/0.89/bin/hbase-config.sh

Author: nspiegelberg
Date: Tue Oct 11 01:59:58 2011
New Revision: 1181337

URL: http://svn.apache.org/viewvc?rev=1181337&view=rev
Log:
Don't set Master/RS options if already set. Needed for psuedo-distributed HBase.

Modified:
    hbase/branches/0.89/bin/hbase-config.sh

Modified: hbase/branches/0.89/bin/hbase-config.sh
URL: http://svn.apache.org/viewvc/hbase/branches/0.89/bin/hbase-config.sh?rev=1181337&r1=1181336&r2=1181337&view=diff
==============================================================================
--- hbase/branches/0.89/bin/hbase-config.sh (original)
+++ hbase/branches/0.89/bin/hbase-config.sh Tue Oct 11 01:59:58 2011
@@ -135,6 +135,12 @@ HBASE_MASTER_DBG_OPTS="$HBASE_MASTER_JDW
 HBASE_REGIONSERVER_DBG_OPTS="$HBASE_REGIONSERVER_JDWP_OPTIONS $HBASE_GC_OPTIONS"
 HBASE_ZOOKEEPER_DBG_OPTS="-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=8072"
 
-export HBASE_MASTER_OPTS="$HBASE_MASTER_DBG_OPTS $HBASE_MASTER_JMX_OPTS"
-export HBASE_REGIONSERVER_OPTS="$HBASE_REGIONSERVER_DBG_OPTS $HBASE_REGIONSERVER_JMX_OPTS"
-export HBASE_ZOOKEEPER_OPTS="$HBASE_ZOOKEEPER_DBG_OPTS"
+if [ -z "$HBASE_MASTER_OPTS" ]; then
+  export HBASE_MASTER_OPTS="$HBASE_MASTER_DBG_OPTS $HBASE_MASTER_JMX_OPTS"
+fi
+if [ -z "$HBASE_REGIONSERVER_OPTS" ]; then
+  export HBASE_REGIONSERVER_OPTS="$HBASE_REGIONSERVER_DBG_OPTS $HBASE_REGIONSERVER_JMX_OPTS"
+fi
+if [ -z "$HBASE_ZOOKEEPER_OPTS" ]; then
+  export HBASE_ZOOKEEPER_OPTS="$HBASE_ZOOKEEPER_DBG_OPTS"
+fi