Index: src/main/java/org/apache/hadoop/hbase/master/HMaster.java =================================================================== --- src/main/java/org/apache/hadoop/hbase/master/HMaster.java (revision 1333011) +++ src/main/java/org/apache/hadoop/hbase/master/HMaster.java (working copy) @@ -698,6 +698,8 @@ splitLogAndExpireIfOnline(currentMetaServer); } assignmentManager.assignMeta(); + serverShutdownHandlerEnabled = true; + this.serverManager.expireDeadNotExpiredServers(); this.catalogTracker.waitForMeta(); // Above check waits for general meta availability but this does not // guarantee that the transition has completed