Author: stack
Date: Mon Sep 19 23:07:18 2011
New Revision: 1172887
URL: http://svn.apache.org/viewvc?rev=1172887&view=rev
Log:
HBASE-4445 Not passing --config when checking if distributed mode or not
Modified:
hbase/branches/0.92/CHANGES.txt
hbase/branches/0.92/bin/start-hbase.sh
hbase/branches/0.92/bin/stop-hbase.sh
Modified: hbase/branches/0.92/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hbase/branches/0.92/CHANGES.txt?rev=1172887&r1=1172886&r2=1172887&view=diff
==============================================================================
--- hbase/branches/0.92/CHANGES.txt (original)
+++ hbase/branches/0.92/CHANGES.txt Mon Sep 19 23:07:18 2011
@@ -612,6 +612,7 @@ Release 0.90.5 - Unreleased
(Jonathan Hsieh)
HBASE-4238 CatalogJanitor can clear a daughter that split before
processing its parent
+ HBASE-4445 Not passing --config when checking if distributed mode or not
IMPROVEMENT
HBASE-4205 Enhance HTable javadoc (Eric Charles)
Modified: hbase/branches/0.92/bin/start-hbase.sh
URL:
http://svn.apache.org/viewvc/hbase/branches/0.92/bin/start-hbase.sh?rev=1172887&r1=1172886&r2=1172887&view=diff
==============================================================================
--- hbase/branches/0.92/bin/start-hbase.sh (original)
+++ hbase/branches/0.92/bin/start-hbase.sh Mon Sep 19 23:07:18 2011
@@ -38,7 +38,7 @@ then
exit $errCode
fi
-distMode=`$bin/hbase org.apache.hadoop.hbase.util.HBaseConfTool
hbase.cluster.distributed`
+distMode=`$bin/hbase --config "$HBASE_CONF_DIR"
org.apache.hadoop.hbase.util.HBaseConfTool hbase.cluster.distributed`
if [ "$distMode" == 'false' ]
Modified: hbase/branches/0.92/bin/stop-hbase.sh
URL:
http://svn.apache.org/viewvc/hbase/branches/0.92/bin/stop-hbase.sh?rev=1172887&r1=1172886&r2=1172887&view=diff
==============================================================================
--- hbase/branches/0.92/bin/stop-hbase.sh (original)
+++ hbase/branches/0.92/bin/stop-hbase.sh Mon Sep 19 23:07:18 2011
@@ -59,7 +59,7 @@ done
echo
# distributed == false means that the HMaster will kill ZK when it exits
-distMode=`$bin/hbase org.apache.hadoop.hbase.util.HBaseConfTool
hbase.cluster.distributed`
+distMode=`$bin/hbase --config "$HBASE_CONF_DIR"
org.apache.hadoop.hbase.util.HBaseConfTool hbase.cluster.distributed`
if [ "$distMode" == 'true' ]
then
# TODO: store backup masters in ZooKeeper and have the primary send them a
shutdown message
