svn commit: r826903 - in /hadoop/hbase/trunk: CHANGES.txt src/java/org/apache/hadoop/hbase/master/RegionManager.java

[jg...@apache.org]

Author: jgray
Date: Tue Oct 20 00:08:07 2009
New Revision: 826903

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

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

Modified: hadoop/hbase/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/CHANGES.txt?rev=826903&r1=826902&r2=826903&view=diff
==============================================================================
--- hadoop/hbase/trunk/CHANGES.txt (original)
+++ hadoop/hbase/trunk/CHANGES.txt Tue Oct 20 00:08:07 2009
@@ -72,6 +72,7 @@
                cause NPE during re-indexing (Mingjui Ray Liao via Andrew
                Purtell)
    HBASE-1916  FindBugs and javac warnings cleanup
+   HBASE-1908  ROOT not reassigned if only one regionserver left
 
   IMPROVEMENTS
    HBASE-1760  Cleanup TODOs in HTable

Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/RegionManager.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/RegionManager.java?rev=826903&r1=826902&r2=826903&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/RegionManager.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/RegionManager.java Tue Oct 20 00:08:07 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;