HBASE-8624 bin/local-{master-backup|regionservers}.sh doesn't take --config arg

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1494455 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael Stack 2013-06-19 04:51:01 +00:00
parent a71464bf84
commit 955f87593e
2 changed files with 8 additions and 4 deletions

View File

@ -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

View File

@ -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