Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-9481. Servershutdown handler get aborted with ConcurrentModificationException 

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1521571 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Devaraj Das 2013-09-10 18:22:32 +00:00
parent 4745caaa87
commit 661d22ce59
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hbase-server/src/main/java/org/apache/hadoop/hbase/master/RegionStates.java
View File

@ -375,6 +375,7 @@ public class RegionStates {
regionAssignments.remove(region); regionAssignments.remove(region);
} }
Set<HRegionInfo> regionsToOffline = new HashSet<HRegionInfo>();
for (RegionState state : regionsInTransition.values()) { for (RegionState state : regionsInTransition.values()) {
HRegionInfo hri = state.getRegion(); HRegionInfo hri = state.getRegion();
if (assignedRegions.contains(hri)) { if (assignedRegions.contains(hri)) {
@ -387,7 +388,8 @@ public class RegionStates {
try { try {
// Delete the ZNode if exists // Delete the ZNode if exists
ZKAssign.deleteNodeFailSilent(watcher, hri); ZKAssign.deleteNodeFailSilent(watcher, hri);
regionOffline(hri); // Offline regions outside the loop to avoid ConcurrentModificationException
regionsToOffline.add(hri);
} catch (KeeperException ke) { } catch (KeeperException ke) {
server.abort("Unexpected ZK exception deleting node " + hri, ke); server.abort("Unexpected ZK exception deleting node " + hri, ke);
} }
@ -406,6 +408,10 @@ public class RegionStates {
} }
} }
} }
for (HRegionInfo hri : regionsToOffline) {
regionOffline(hri);
}
assignedRegions.clear(); assignedRegions.clear();
this.notifyAll(); this.notifyAll();
return rits; return rits;