Index: src/main/java/org/apache/hadoop/hbase/master/HMaster.java =================================================================== --- src/main/java/org/apache/hadoop/hbase/master/HMaster.java (revision 1158586) +++ src/main/java/org/apache/hadoop/hbase/master/HMaster.java (working copy) @@ -548,6 +548,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++; } else { // Region already assigned. We didnt' assign it. Add to in-memory state.