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 2013/06/19 06:51:18 UTC
svn commit: r1494456 - in /hbase/branches/0.95/bin: local-master-backup.sh local-regionservers.sh

Author: stack
Date: Wed Jun 19 04:51:17 2013
New Revision: 1494456

URL: http://svn.apache.org/r1494456
Log:
HBASE-8624 bin/local-{master-backup|regionservers}.sh doesn't take --config arg

Modified:
    hbase/branches/0.95/bin/local-master-backup.sh
    hbase/branches/0.95/bin/local-regionservers.sh

Modified: hbase/branches/0.95/bin/local-master-backup.sh
URL: http://svn.apache.org/viewvc/hbase/branches/0.95/bin/local-master-backup.sh?rev=1494456&r1=1494455&r2=1494456&view=diff
==============================================================================
--- hbase/branches/0.95/bin/local-master-backup.sh (original)
+++ hbase/branches/0.95/bin/local-master-backup.sh Wed Jun 19 04:51:17 2013
@@ -27,12 +27,14 @@ bin=`cd "$bin" >/dev/null && pwd`
 
 if [ $# -lt 2 ]; then
   S=`basename "${BASH_SOURCE-$0}"`
-  echo "Usage: $S [start|stop] offset(s)"
+  echo "Usage: $S [--config <conf-dir>] [start|stop] offset(s)"
   echo ""
   echo "    e.g. $S start 1"
   exit
 fi
 
+. "$bin"/hbase-config.sh
+
 # sanity check: make sure your master opts don't use ports [i.e. JMX/DBG]
 export HBASE_MASTER_OPTS=" "
 
@@ -43,7 +45,7 @@ run_master () {
     -D hbase.master.port=`expr 60000 + $DN` \
     -D hbase.master.info.port=`expr 60010 + $DN` \
     --backup"
-  "$bin"/hbase-daemon.sh $1 master $HBASE_MASTER_ARGS
+  "$bin"/hbase-daemon.sh --config "${HBASE_CONF_DIR}" $1 master $HBASE_MASTER_ARGS
 }
 
 cmd=$1

Modified: hbase/branches/0.95/bin/local-regionservers.sh
URL: http://svn.apache.org/viewvc/hbase/branches/0.95/bin/local-regionservers.sh?rev=1494456&r1=1494455&r2=1494456&view=diff
==============================================================================
--- hbase/branches/0.95/bin/local-regionservers.sh (original)
+++ hbase/branches/0.95/bin/local-regionservers.sh Wed Jun 19 04:51:17 2013
@@ -27,12 +27,14 @@ bin=`cd "$bin" >/dev/null && pwd`
 
 if [ $# -lt 2 ]; then
   S=`basename "${BASH_SOURCE-$0}"`
-  echo "Usage: $S [start|stop] offset(s)"
+  echo "Usage: $S [--config <conf-dir>] [start|stop] offset(s)"
   echo ""
   echo "    e.g. $S start 1 2"
   exit
 fi
 
+. "$bin"/hbase-config.sh
+
 # sanity check: make sure your regionserver opts don't use ports [i.e. JMX/DBG]
 export HBASE_REGIONSERVER_OPTS=" "
 
@@ -42,7 +44,7 @@ run_regionserver () {
   HBASE_REGIONSERVER_ARGS="\
     -D hbase.regionserver.port=`expr 60200 + $DN` \
     -D hbase.regionserver.info.port=`expr 60300 + $DN`"
-  "$bin"/hbase-daemon.sh $1 regionserver $HBASE_REGIONSERVER_ARGS
+  "$bin"/hbase-daemon.sh  --config "${HBASE_CONF_DIR}" $1 regionserver $HBASE_REGIONSERVER_ARGS
 }
 
 cmd=$1