hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From st...@apache.org
Subject svn commit: r1212054 - in /hbase/branches/0.90: CHANGES.txt bin/graceful_stop.sh
Date Thu, 08 Dec 2011 19:22:09 GMT
Author: stack
Date: Thu Dec  8 19:22:09 2011
New Revision: 1212054

URL: http://svn.apache.org/viewvc?rev=1212054&view=rev
Log:
HBASE-4982 graceful_stop.sh does not pass on the --config its passed to its internal invocations
of other hbase scripts

Modified:
    hbase/branches/0.90/CHANGES.txt
    hbase/branches/0.90/bin/graceful_stop.sh

Modified: hbase/branches/0.90/CHANGES.txt
URL: http://svn.apache.org/viewvc/hbase/branches/0.90/CHANGES.txt?rev=1212054&r1=1212053&r2=1212054&view=diff
==============================================================================
--- hbase/branches/0.90/CHANGES.txt (original)
+++ hbase/branches/0.90/CHANGES.txt Thu Dec  8 19:22:09 2011
@@ -132,6 +132,8 @@ Release 0.90.5 - Unreleased
    HBASE-4806  Fix logging message in HbaseObjectWritable
                (Jonathan Hsieh via todd)
    HBASE-4944  Optionally verify bulk loaded HFiles
+   HBASE-4982  graceful_stop.sh does not pass on the --config its passed to its
+               internal invocations of other hbase scripts
 
   NEW FEATURE
    HBASE-4377  [hbck] Offline rebuild .META. from fs data only

Modified: hbase/branches/0.90/bin/graceful_stop.sh
URL: http://svn.apache.org/viewvc/hbase/branches/0.90/bin/graceful_stop.sh?rev=1212054&r1=1212053&r2=1212054&view=diff
==============================================================================
--- hbase/branches/0.90/bin/graceful_stop.sh (original)
+++ hbase/branches/0.90/bin/graceful_stop.sh Thu Dec  8 19:22:09 2011
@@ -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



Mime
View raw message