Author: stack
Date: Thu May 30 23:11:51 2013
New Revision: 1488046
URL: http://svn.apache.org/r1488046
Log:
HBASE-8658 hbase clean is deaf to the --config DIR option
Modified:
hbase/branches/0.95/bin/hbase
hbase/branches/0.95/bin/hbase-cleanup.sh
Modified: hbase/branches/0.95/bin/hbase
URL:
http://svn.apache.org/viewvc/hbase/branches/0.95/bin/hbase?rev=1488046&r1=1488045&r2=1488046&view=diff
==============================================================================
--- hbase/branches/0.95/bin/hbase (original)
+++ hbase/branches/0.95/bin/hbase Thu May 30 23:11:51 2013
@@ -321,7 +321,7 @@ elif [ "$COMMAND" = "clean" ] ; then
echo " --cleanAll cleans hbase related data from both zookeeper
and hdfs."
exit 1;
fi
- "$bin"/hbase-cleanup.sh $@
+ "$bin"/hbase-cleanup.sh --config ${HBASE_CONF_DIR} $@
exit $?
elif [ "$COMMAND" = "classpath" ] ; then
Modified: hbase/branches/0.95/bin/hbase-cleanup.sh
URL:
http://svn.apache.org/viewvc/hbase/branches/0.95/bin/hbase-cleanup.sh?rev=1488046&r1=1488045&r2=1488046&view=diff
==============================================================================
--- hbase/branches/0.95/bin/hbase-cleanup.sh (original)
+++ hbase/branches/0.95/bin/hbase-cleanup.sh Thu May 30 23:11:51 2013
@@ -51,7 +51,7 @@ fi
format_option=$1;
-distMode=`$bin/hbase org.apache.hadoop.hbase.util.HBaseConfTool
hbase.cluster.distributed | head -n 1`
+distMode=`$bin/hbase --config ${HBASE_CONF_DIR}
org.apache.hadoop.hbase.util.HBaseConfTool hbase.cluster.distributed | head -n
1`
if [ "$distMode" == 'false' ];then
echo "Skipping hbase data clearing in standalone mode." 2>&1
