### Eclipse Workspace Patch 1.0 #P apache-hbase-trunk Index: hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java =================================================================== --- hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java (revision 1369800) +++ hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java (working copy) @@ -1992,7 +1992,8 @@ // Presume that master has stale data. Presume remote side just split. // Presume that the split message when it comes in will fix up the master's // in memory cluster state. - if (checkIfRegionBelongsToDisabling(region)) { + if (checkIfRegionBelongsToDisabling(region) + || checkIfRegionBelongsToDisabled(region)) { // Remove from the regionsinTransition map LOG.info("While trying to recover the table " + region.getTableNameAsString() Index: hbase-server/src/main/java/org/apache/hadoop/hbase/master/RegionStates.java =================================================================== --- hbase-server/src/main/java/org/apache/hadoop/hbase/master/RegionStates.java (revision 1369800) +++ hbase-server/src/main/java/org/apache/hadoop/hbase/master/RegionStates.java (working copy) @@ -313,9 +313,8 @@ } } updateRegionState(hri, State.OFFLINE); - regionsInTransition.remove(regionName); - ServerName oldServerName = regionAssignments.remove(hri); + regionsInTransition.remove(regionName); if (oldServerName != null) { LOG.info("Offlined region " + hri + " from " + oldServerName); serverHoldings.get(oldServerName).remove(hri);