HBASE-964 Startup stuck "waiting for root region"

git-svn-id: https://svn.apache.org/repos/asf/hadoop/hbase/trunk@712586 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -104,6 +104,7 @@ Release 0.19.0 - Unreleased
    HBASE-975   Improve MapFile performance for start and end key
    HBASE-961   Delete multiple columns by regular expression
                (Samuel Guo via Stack)
+   HBASE-964   Startup stuck "waiting for root region"
         
   NEW FEATURES
    HBASE-875   Use MurmurHash instead of JenkinsHash [in bloomfilters]

src/java/org/apache/hadoop/hbase/master/HMaster.java

@@ -800,7 +800,7 @@ public class HMaster extends Thread implements HConstants, HMasterInterface,
 
   public HServerAddress findRootRegion() {
     HServerAddress rootServer = null;
-    if (regionManager.allRegionsAssigned()) {
+    if (regionManager.isInitialMetaScanComplete()) {
       rootServer = regionManager.getRootRegionLocation();
     }
     return rootServer;

src/test/org/apache/hadoop/hbase/HBaseClusterTestCase.java

@@ -87,9 +87,6 @@ public abstract class HBaseClusterTestCase extends HBaseTestCase {
     // start the mini cluster
     this.cluster = new MiniHBaseCluster(conf, regionServers);
     // opening the META table ensures that cluster is running
-    // We need to sleep because we cannot open a HTable when the cluster
-    // is not ready
-    Thread.sleep(5000);
     new HTable(conf, HConstants.META_TABLE_NAME);
   }