Index: src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java =================================================================== --- src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java (revision 1022682) +++ src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java (working copy) @@ -594,6 +594,11 @@ region.getRegionNameAsString()); return; } + if (this.serverManager.isClusterShutdown()) { + LOG.info("Cluster shutdown is set; skipping assign of " + + region.getRegionNameAsString()); + return; + } RegionState state = addToRegionsInTransition(region); synchronized (state) { assign(state);