svn commit: r1234377 - in /hbase/trunk: CHANGES.txt src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java

[ra...@apache.org]

Author: ramkrishna
Date: Sat Jan 21 17:47:08 2012
New Revision: 1234377

URL: http://svn.apache.org/viewvc?rev=1234377&view=rev
Log:
HBASE-5237 Addendum for HBASE-5160 and HBASE-4397 (Ram)

Modified:
    hbase/trunk/CHANGES.txt
    hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java

Modified: hbase/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hbase/trunk/CHANGES.txt?rev=1234377&r1=1234376&r2=1234377&view=diff
==============================================================================
--- hbase/trunk/CHANGES.txt (original)
+++ hbase/trunk/CHANGES.txt Sat Jan 21 17:47:08 2012
@@ -6,6 +6,7 @@ Release 0.93.0 - Unreleased
 Release 0.92.1 - Unreleased
   BUG FIXES
    HBASE-5176  AssignmentManager#getRegion: logging nit  adds a redundant '+' (Karthik K)
+   HBASE-5237  Addendum for HBASE-5160 and HBASE-4397 (Ram)
 
   TESTS
    HBASE-5223  TestMetaReaderEditor is missing call to CatalogTracker.stop()

Modified: hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java?rev=1234377&r1=1234376&r2=1234377&view=diff
==============================================================================
--- hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java (original)
+++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java Sat Jan 21 17:47:08 2012
@@ -1441,6 +1441,7 @@ public class AssignmentManager extends Z
       RegionPlan plan = getRegionPlan(state, forceNewPlan);
       if (plan == null) {
         LOG.debug("Unable to determine a plan to assign " + state);
+        this.timeoutMonitor.setAllRegionServersOffline(true);
         return; // Should get reassigned later when RIT times out.
       }
       try {