Index: src/main/java/org/apache/hadoop/hbase/HRegionInfo.java =================================================================== --- src/main/java/org/apache/hadoop/hbase/HRegionInfo.java (revision 1040276) +++ src/main/java/org/apache/hadoop/hbase/HRegionInfo.java (working copy) @@ -644,7 +644,7 @@ } // Are regions of same table? - int result = this.tableDesc.compareTo(o.tableDesc); + int result = Bytes.compareTo(this.tableDesc.getName(), o.tableDesc.getName()); if (result != 0) { return result; } Index: src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java =================================================================== --- src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java (revision 1040276) +++ src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java (working copy) @@ -974,12 +974,14 @@ public void unassign(HRegionInfo region, boolean force) { LOG.debug("Starting unassignment of region " + region.getRegionNameAsString() + " (offlining)"); - // Check if this region is currently assigned - if (!regions.containsKey(region)) { - LOG.debug("Attempted to unassign region " + - region.getRegionNameAsString() + " but it is not " + - "currently assigned anywhere"); - return; + synchronized (this.regions) { + // Check if this region is currently assigned + if (!regions.containsKey(region)) { + LOG.debug("Attempted to unassign region " + + region.getRegionNameAsString() + " but it is not " + + "currently assigned anywhere"); + return; + } } String encodedName = region.getEncodedName(); // Grab the state of this region and synchronize on it @@ -1359,9 +1361,6 @@ } synchronized (this.regions) { this.regions.remove(hri); - } - clearRegionPlan(hri.getEncodedName()); - synchronized (this.servers) { for (List regions : this.servers.values()) { for (int i=0;i tableRegions = new ArrayList(); HRegionInfo boundary = new HRegionInfo(new HTableDescriptor(tableName), null, null); - for (HRegionInfo regionInfo: this.regions.tailMap(boundary).keySet()) { - if(Bytes.equals(regionInfo.getTableDesc().getName(), tableName)) { - tableRegions.add(regionInfo); - } else { - break; + synchronized (this.regions) { + for (HRegionInfo regionInfo: this.regions.tailMap(boundary).keySet()) { + if(Bytes.equals(regionInfo.getTableDesc().getName(), tableName)) { + tableRegions.add(regionInfo); + } else { + break; + } } } return tableRegions;