svn commit: r1385026 - in /hbase/trunk/bin: rolling-restart.sh start-hbase.sh stop-hbase.sh

[st...@apache.org]

Author: stack
Date: Sat Sep 15 07:32:52 2012
New Revision: 1385026

URL: http://svn.apache.org/viewvc?rev=1385026&view=rev
Log:
HBASE-6504 Adding GC details prevents HBase from starting in non-distributed mode

Modified:
    hbase/trunk/bin/rolling-restart.sh
    hbase/trunk/bin/start-hbase.sh
    hbase/trunk/bin/stop-hbase.sh

Modified: hbase/trunk/bin/rolling-restart.sh
URL: http://svn.apache.org/viewvc/hbase/trunk/bin/rolling-restart.sh?rev=1385026&r1=1385025&r2=1385026&view=diff
==============================================================================
--- hbase/trunk/bin/rolling-restart.sh (original)
+++ hbase/trunk/bin/rolling-restart.sh Sat Sep 15 07:32:52 2012
@@ -84,7 +84,8 @@ for x in "$@" ; do
 done
 
 # quick function to get a value from the HBase config file
-distMode=`$bin/hbase org.apache.hadoop.hbase.util.HBaseConfTool hbase.cluster.distributed`
+# HBASE-6504 - only take the first line of the output in case verbose gc is on
+distMode=`$bin/hbase org.apache.hadoop.hbase.util.HBaseConfTool hbase.cluster.distributed | head -n 1`
 if [ "$distMode" == 'false' ]; then
   if [ $RR_RS -ne 1 ] || [ $RR_MASTER -ne 1 ]; then
     echo Cant do selective rolling restart if not running distributed

Modified: hbase/trunk/bin/start-hbase.sh
URL: http://svn.apache.org/viewvc/hbase/trunk/bin/start-hbase.sh?rev=1385026&r1=1385025&r2=1385026&view=diff
==============================================================================
--- hbase/trunk/bin/start-hbase.sh (original)
+++ hbase/trunk/bin/start-hbase.sh Sat Sep 15 07:32:52 2012
@@ -46,7 +46,8 @@ else 
   commandToRun="start"
 fi
 
-distMode=`$bin/hbase --config "$HBASE_CONF_DIR" org.apache.hadoop.hbase.util.HBaseConfTool hbase.cluster.distributed`
+# HBASE-6504 - only take the first line of the output in case verbose gc is on
+distMode=`$bin/hbase --config "$HBASE_CONF_DIR" org.apache.hadoop.hbase.util.HBaseConfTool hbase.cluster.distributed | head -n 1`
 
 
 if [ "$distMode" == 'false' ] 

Modified: hbase/trunk/bin/stop-hbase.sh
URL: http://svn.apache.org/viewvc/hbase/trunk/bin/stop-hbase.sh?rev=1385026&r1=1385025&r2=1385026&view=diff
==============================================================================
--- hbase/trunk/bin/stop-hbase.sh (original)
+++ hbase/trunk/bin/stop-hbase.sh Sat Sep 15 07:32:52 2012
@@ -60,7 +60,8 @@ done
 echo
 
 # distributed == false means that the HMaster will kill ZK when it exits
-distMode=`$bin/hbase --config "$HBASE_CONF_DIR" org.apache.hadoop.hbase.util.HBaseConfTool hbase.cluster.distributed`
+# HBASE-6504 - only take the first line of the output in case verbose gc is on
+distMode=`$bin/hbase --config "$HBASE_CONF_DIR" org.apache.hadoop.hbase.util.HBaseConfTool hbase.cluster.distributed | head -n 1`
 if [ "$distMode" == 'true' ] 
 then
   # TODO: store backup masters in ZooKeeper and have the primary send them a shutdown message