Index: src/main/java/org/apache/hadoop/hbase/master/handler/ServerShutdownHandler.java =================================================================== --- src/main/java/org/apache/hadoop/hbase/master/handler/ServerShutdownHandler.java (revision 1339069) +++ src/main/java/org/apache/hadoop/hbase/master/handler/ServerShutdownHandler.java (working copy) @@ -322,8 +322,8 @@ } /** - * Process a dead region from a dead RS. Checks if the region is disabled - * or if the region has a partially completed split. + * Process a dead region from a dead RS. Checks if the region is disabled or + * disabling or if the region has a partially completed split. * @param hri * @param result * @param assignmentManager @@ -358,6 +358,13 @@ fixupDaughters(result, assignmentManager, catalogTracker); return false; } + boolean disabling = assignmentManager.getZKTable().isDisablingTable( + hri.getTableNameAsString()); + if (disabling) { + LOG.info("The table " + hri.getTableNameAsString() + + " is disabled. Hence not assigning region" + hri.getEncodedName()); + return false; + } return true; }