Index: src/main/java/org/apache/hadoop/hbase/master/HMaster.java =================================================================== --- src/main/java/org/apache/hadoop/hbase/master/HMaster.java (revision 1029789) +++ src/main/java/org/apache/hadoop/hbase/master/HMaster.java (working copy) @@ -348,6 +348,9 @@ this.serverManager); this.regionServerTracker.start(); + // start up all service threads. + startServiceThreads(); + // Set the cluster as up. If new RSs, they'll be waiting on this before // going ahead with their startup. this.clusterStatusTracker = new ClusterStatusTracker(getZooKeeper(), this); @@ -360,9 +363,6 @@ Long.toHexString(this.zooKeeper.getZooKeeper().getSessionId()) + ", cluster-up flag was=" + wasUp); - // start up all service threads. - startServiceThreads(); - // Wait for region servers to report in. Returns count of regions. int regionCount = this.serverManager.waitForRegionServers();