Index: src/main/java/org/apache/hadoop/hbase/master/HMaster.java =================================================================== --- src/main/java/org/apache/hadoop/hbase/master/HMaster.java (revision 1158571) +++ src/main/java/org/apache/hadoop/hbase/master/HMaster.java (working copy) @@ -430,6 +430,8 @@ if (!catalogTracker.verifyRootRegionLocation(timeout)) { this.assignmentManager.assignRoot(); this.catalogTracker.waitForRoot(); + //This guarantees that the transition has completed + this.assignmentManager.waitForAssignment(HRegionInfo.ROOT_REGIONINFO); assigned++; } LOG.info("-ROOT- assigned=" + assigned + ", rit=" + rit +