From 685762a6917d5dad0dbfdf80b0feb082b8ce7545 Mon Sep 17 00:00:00 2001 From: Michael Stack Date: Thu, 8 Dec 2011 19:19:45 +0000 Subject: [PATCH] HBASE-4982 graceful_stop.sh does not pass on the --config its passed to its internal invocations of other hbase scripts git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1212050 13f79535-47bb-0310-9956-ffa450edef68 --- bin/graceful_stop.sh | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/bin/graceful_stop.sh b/bin/graceful_stop.sh index 9f49d0c5638..cf7bee86ff1 100644 --- a/bin/graceful_stop.sh +++ b/bin/graceful_stop.sh @@ -70,32 +70,32 @@ hostname=$1 filename="/tmp/$hostname" # Run the region mover script. echo "Disabling balancer!" -echo 'balance_switch false' | "$bin"/hbase shell +echo 'balance_switch false' | "$bin"/hbase --config ${HBASE_CONF_DIR} shell echo "Unloading $hostname region(s)" -HBASE_NOEXEC=true "$bin"/hbase org.jruby.Main "$bin"/region_mover.rb --file=$filename $debug unload $hostname +HBASE_NOEXEC=true "$bin"/hbase --config ${HBASE_CONF_DIR} org.jruby.Main "$bin"/region_mover.rb --file=$filename $debug unload $hostname echo "Unloaded $hostname region(s)" # Stop the server. Have to put hostname into its own little file for hbase-daemons.sh hosts="/tmp/$(basename $0).$$.tmp" echo $hostname >> $hosts if [ "$thrift" != "" ]; then - "$bin"/hbase-daemons.sh --hosts ${hosts} stop thrift + "$bin"/hbase-daemons.sh --config ${HBASE_CONF_DIR} --hosts ${hosts} stop thrift fi if [ "$rest" != "" ]; then - "$bin"/hbase-daemons.sh --hosts ${hosts} stop rest + "$bin"/hbase-daemons.sh --config ${HBASE_CONF_DIR} --hosts ${hosts} stop rest fi -"$bin"/hbase-daemons.sh --hosts ${hosts} stop regionserver +"$bin"/hbase-daemons.sh --config ${HBASE_CONF_DIR} --hosts ${hosts} stop regionserver if [ "$restart" != "" ]; then - "$bin"/hbase-daemons.sh --hosts ${hosts} start regionserver + "$bin"/hbase-daemons.sh --config ${HBASE_CONF_DIR} --hosts ${hosts} start regionserver if [ "$thrift" != "" ]; then # -b 0.0.0.0 says listen on all interfaces rather than just default. - "$bin"/hbase-daemons.sh --hosts ${hosts} start thrift -b 0.0.0.0 + "$bin"/hbase-daemons.sh --config ${HBASE_CONF_DIR} --hosts ${hosts} start thrift -b 0.0.0.0 fi if [ "$rest" != "" ]; then - "$bin"/hbase-daemons.sh --hosts ${hosts} start rest + "$bin"/hbase-daemons.sh --config ${HBASE_CONF_DIR} --hosts ${hosts} start rest fi if [ "$reload" != "" ]; then echo "Reloading $hostname region(s)" - HBASE_NOEXEC=true "$bin"/hbase org.jruby.Main "$bin"/region_mover.rb --file=$filename $debug load $hostname + HBASE_NOEXEC=true "$bin"/hbase --config ${HBASE_CONF_DIR} org.jruby.Main "$bin"/region_mover.rb --file=$filename $debug load $hostname echo "Reloaded $hostname region(s)" fi fi