Index: src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java =================================================================== --- src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java (revision 1330124) +++ src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java (working copy) @@ -1361,6 +1361,10 @@ // Remove from the regionsMap synchronized (this.regions) { this.regions.remove(region); + Set serverRegions = this.servers.get(server); + if (!serverRegions.remove(region)) { + LOG.warn("No " + region + " on " + server); + } } } }