svn commit: r826904 - in /hadoop/hbase/branches/0.20: CHANGES.txt src/java/org/apache/hadoop/hbase/master/RegionManager.java

[jgray]

Author: jgray
Date: Tue Oct 20 00:08:16 2009
New Revision: 826904

URL: http://svn.apache.org/viewvc?rev=826904&view=rev
Log:
HBASE-1908  ROOT not reassigned if only one regionserver left

Modified:
    hadoop/hbase/branches/0.20/CHANGES.txt
    
hadoop/hbase/branches/0.20/src/java/org/apache/hadoop/hbase/master/RegionManager.java

Modified: hadoop/hbase/branches/0.20/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/hbase/branches/0.20/CHANGES.txt?rev=826904&r1=826903&r2=826904&view=diff
==============================================================================
--- hadoop/hbase/branches/0.20/CHANGES.txt (original)
+++ hadoop/hbase/branches/0.20/CHANGES.txt Tue Oct 20 00:08:16 2009
@@ -12,6 +12,7 @@
                cause NPE during re-indexing (Mingjui Ray Liao via Andrew
                Purtell)
    HBASE-1917  TestScanner.testFilters failing
+   HBASE-1908  ROOT not reassigned if only one regionserver left
 
   IMPROVEMENTS
    HBASE-1899  Use scanner caching in shell count

Modified: 
hadoop/hbase/branches/0.20/src/java/org/apache/hadoop/hbase/master/RegionManager.java
URL: 
http://svn.apache.org/viewvc/hadoop/hbase/branches/0.20/src/java/org/apache/hadoop/hbase/master/RegionManager.java?rev=826904&r1=826903&r2=826904&view=diff
==============================================================================
--- 
hadoop/hbase/branches/0.20/src/java/org/apache/hadoop/hbase/master/RegionManager.java
 (original)
+++ 
hadoop/hbase/branches/0.20/src/java/org/apache/hadoop/hbase/master/RegionManager.java
 Tue Oct 20 00:08:16 2009
@@ -400,8 +400,9 @@
       // make sure root isnt assigned here first.
       // if so return 'empty list'
       // by definition there is no way this could be a ROOT region (since it's
-      // unassigned) so just make sure it isn't hosting META regions.
-      if (!isMetaServer) {
+      // unassigned) so just make sure it isn't hosting META regions (unless
+      // it's the only server left).
+      if (!isMetaServer || isSingleServer) {
         regionsToAssign.add(rootState);
       }
       return regionsToAssign;