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

[ra...@apache.org]

Author: ramkrishna
Date: Wed Oct  5 04:43:05 2011
New Revision: 1179052

URL: http://svn.apache.org/viewvc?rev=1179052&view=rev
Log:
HBASE-4479 TestMasterFailover failure in Hbase-0.92#17(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=1179052&r1=1179051&r2=1179052&view=diff
==============================================================================
--- hbase/trunk/CHANGES.txt (original)
+++ hbase/trunk/CHANGES.txt Wed Oct  5 04:43:05 2011
@@ -343,6 +343,7 @@ Release 0.92.0 - Unreleased
                blocks read and for catching regressions (Kannan)
    HBASE-4492  TestRollingRestart fails intermittently (Ted Yu and Ram)
    HBASE-4512  JVMClusterUtil throwing wrong exception when master thread cannot be created (Ram)
+   HBASE-4479  TestMasterFailover failure in Hbase-0.92#17(Ram)
 
   IMPROVEMENTS
    HBASE-3290  Max Compaction Size (Nicolas Spiegelberg via Stack)  

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=1179052&r1=1179051&r2=1179052&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 Wed Oct  5 04:43:05 2011
@@ -1865,6 +1865,9 @@ public class AssignmentManager extends Z
     // Get all available servers
     List<ServerName> servers = serverManager.getOnlineServersList();
 
+    // If there are no servers we need not proceed with region assignment.
+    if(servers.isEmpty()) return;
+
     // Scan META for all user regions, skipping any disabled tables
     Map<HRegionInfo, ServerName> allRegions =
       MetaReader.fullScan(catalogTracker, this.zkTable.getDisabledTables(), true);