Index: src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java =================================================================== --- src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java (revision 1330123) +++ src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java (working copy) @@ -1660,6 +1660,7 @@ } synchronized (this.regions) { this.regions.put(plan.getRegionInfo(), plan.getDestination()); + addToServers(plan.getDestination(), plan.getRegionInfo()); } } break; @@ -2071,6 +2072,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); + } } deleteClosingOrClosedNode(region); }