svn commit: r1181935 - in /hbase/branches/0.89: bin/hbase-daemon.sh src/main/java/org/apache/hadoop/hbase/master/RegionManager.java

[ns...@apache.org]

Author: nspiegelberg
Date: Tue Oct 11 17:42:57 2011
New Revision: 1181935

URL: http://svn.apache.org/viewvc?rev=1181935&view=rev
Log:
Fixing a small issue in rolling restart patch

Summary: Forgot to change the ruby script name when calling it from
hbase-daemon.sh. Also modified a debug feature, at Kannan's suggestion.
Test Plan: Tested on dev server. Plus, no functionality changes since dark
launch test.
Reviewed By: kannan
Reviewers: kannan
CC: hbase@lists, kannan
Differential Revision: 304844

Modified:
    hbase/branches/0.89/bin/hbase-daemon.sh
    hbase/branches/0.89/src/main/java/org/apache/hadoop/hbase/master/RegionManager.java

Modified: hbase/branches/0.89/bin/hbase-daemon.sh
URL: http://svn.apache.org/viewvc/hbase/branches/0.89/bin/hbase-daemon.sh?rev=1181935&r1=1181934&r2=1181935&view=diff
==============================================================================
--- hbase/branches/0.89/bin/hbase-daemon.sh (original)
+++ hbase/branches/0.89/bin/hbase-daemon.sh Tue Oct 11 17:42:57 2011
@@ -183,7 +183,7 @@ case $startStop in
     case $command in
       (regionserver)
         echo -n "Stopping regionserver for a restart"
-        $bin/hbase org.jruby.Main $bin/restart_regionserver.rb &
+        $bin/hbase org.jruby.Main $bin/stop_regionserver_for_restart.rb &
         while kill -0 `cat $pid` > /dev/null 2>&1; do
           echo -n "."
           sleep 1;

Modified: hbase/branches/0.89/src/main/java/org/apache/hadoop/hbase/master/RegionManager.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89/src/main/java/org/apache/hadoop/hbase/master/RegionManager.java?rev=1181935&r1=1181934&r2=1181935&view=diff
==============================================================================
--- hbase/branches/0.89/src/main/java/org/apache/hadoop/hbase/master/RegionManager.java (original)
+++ hbase/branches/0.89/src/main/java/org/apache/hadoop/hbase/master/RegionManager.java Tue Oct 11 17:42:57 2011
@@ -514,9 +514,16 @@ public class RegionManager {
     // regionsInTransition
     Set<HRegionInfo> regions = unholdRestartingServer(addr);
     if (null != regions) {
+      StringBuilder regionNames = new StringBuilder();
+      regionNames.append("[ ");
+      for (HRegionInfo region : regions) {
+        regionNames.append(region.getRegionNameAsString());
+        regionNames.append(" , ");
+      }
+      regionNames.append(" ]");
       restaringServerAndOnTime.setValue(true);
       LOG.debug("RegionServer " + addr.getHostname()
-          + " should receive regions " + regions
+          + " should receive regions " + regionNames.toString()
           + " coming back from restart");
       // One could use regionsInTransition.keySet().containsAll(regions) but
       // this provides more control and probably the same complexity. Also, this