Index: src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java =================================================================== --- src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java (revision 1051379) +++ src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java (working copy) @@ -1557,11 +1557,13 @@ // Expired! Do a retry. switch (regionState.getState()) { case CLOSED: - LOG.info("Region has been CLOSED for too long, " + - "retriggering ClosedRegionHandler"); - AssignmentManager.this.executorService.submit( - new ClosedRegionHandler(master, AssignmentManager.this, - regionState.getRegion())); + LOG.info("Region " + regionInfo.getEncodedName() + + " has been CLOSED for too long, waiting on queued " + + "ClosedRegionHandler to run or server shutdown"); + // Update our timestamp. + synchronized(regionState) { + regionState.update(regionState.getState()); + } break; case OFFLINE: LOG.info("Region has been OFFLINE for too long, " +