You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2012/09/15 09:33:27 UTC
svn commit: r1385027 - in /hbase/branches/0.94/bin: rolling-restart.sh
start-hbase.sh stop-hbase.sh
Author: stack
Date: Sat Sep 15 07:33:26 2012
New Revision: 1385027
URL: http://svn.apache.org/viewvc?rev=1385027&view=rev
Log:
HBASE-6504 Adding GC details prevents HBase from starting in non-distributed mode
Modified:
hbase/branches/0.94/bin/rolling-restart.sh
hbase/branches/0.94/bin/start-hbase.sh
hbase/branches/0.94/bin/stop-hbase.sh
Modified: hbase/branches/0.94/bin/rolling-restart.sh
URL: http://svn.apache.org/viewvc/hbase/branches/0.94/bin/rolling-restart.sh?rev=1385027&r1=1385026&r2=1385027&view=diff
==============================================================================
--- hbase/branches/0.94/bin/rolling-restart.sh (original)
+++ hbase/branches/0.94/bin/rolling-restart.sh Sat Sep 15 07:33:26 2012
@@ -76,7 +76,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/branches/0.94/bin/start-hbase.sh
URL: http://svn.apache.org/viewvc/hbase/branches/0.94/bin/start-hbase.sh?rev=1385027&r1=1385026&r2=1385027&view=diff
==============================================================================
--- hbase/branches/0.94/bin/start-hbase.sh (original)
+++ hbase/branches/0.94/bin/start-hbase.sh Sat Sep 15 07:33:26 2012
@@ -38,7 +38,8 @@ then
exit $errCode
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/branches/0.94/bin/stop-hbase.sh
URL: http://svn.apache.org/viewvc/hbase/branches/0.94/bin/stop-hbase.sh?rev=1385027&r1=1385026&r2=1385027&view=diff
==============================================================================
--- hbase/branches/0.94/bin/stop-hbase.sh (original)
+++ hbase/branches/0.94/bin/stop-hbase.sh Sat Sep 15 07:33:26 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