From a0a474455627c82343da3ab75def6e04b1191422 Mon Sep 17 00:00:00 2001 From: Devaraj Das Date: Wed, 12 Mar 2014 23:26:17 +0000 Subject: [PATCH 22/45] HBASE-10734. Fix RegionStates.getRegionAssignments to not add duplicate regions git-svn-id: https://svn.apache.org/repos/asf/hbase/branches/hbase-10070@1577001 13f79535-47bb-0310-9956-ffa450edef68 --- .../java/org/apache/hadoop/hbase/master/RegionStates.java | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git hbase-server/src/main/java/org/apache/hadoop/hbase/master/RegionStates.java hbase-server/src/main/java/org/apache/hadoop/hbase/master/RegionStates.java index 549265f..8bb2b11 100644 --- hbase-server/src/main/java/org/apache/hadoop/hbase/master/RegionStates.java +++ hbase-server/src/main/java/org/apache/hadoop/hbase/master/RegionStates.java @@ -159,22 +159,12 @@ public class RegionStates { Map> map = new HashMap>(); for (HRegionInfo region : regions) { HRegionInfo defaultReplica = RegionReplicaUtil.getRegionInfoForDefaultReplica(region); - ServerName server = regionAssignments.get(defaultReplica); - List regionsOnServer; - if (server != null) { - regionsOnServer = map.get(server); - if (regionsOnServer == null) { - regionsOnServer = new ArrayList(1); - map.put(server, regionsOnServer); - } - regionsOnServer.add(defaultReplica); - } Set allReplicas = defaultReplicaToOtherReplicas.get(defaultReplica); if (allReplicas != null) { for (HRegionInfo hri : allReplicas) { - server = regionAssignments.get(hri); + ServerName server = regionAssignments.get(hri); if (server != null) { - regionsOnServer = map.get(server); + List regionsOnServer = map.get(server); if (regionsOnServer == null) { regionsOnServer = new ArrayList(1); map.put(server, regionsOnServer); -- 2.0.0