You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by dd...@apache.org on 2014/03/13 00:26:18 UTC
svn commit: r1577001 -
/hbase/branches/hbase-10070/hbase-server/src/main/java/org/apache/hadoop/hbase/master/RegionStates.java
Author: ddas
Date: Wed Mar 12 23:26:17 2014
New Revision: 1577001
URL: http://svn.apache.org/r1577001
Log:
HBASE-10734. Fix RegionStates.getRegionAssignments to not add duplicate regions
Modified:
hbase/branches/hbase-10070/hbase-server/src/main/java/org/apache/hadoop/hbase/master/RegionStates.java
Modified: hbase/branches/hbase-10070/hbase-server/src/main/java/org/apache/hadoop/hbase/master/RegionStates.java
URL: http://svn.apache.org/viewvc/hbase/branches/hbase-10070/hbase-server/src/main/java/org/apache/hadoop/hbase/master/RegionStates.java?rev=1577001&r1=1577000&r2=1577001&view=diff
==============================================================================
--- hbase/branches/hbase-10070/hbase-server/src/main/java/org/apache/hadoop/hbase/master/RegionStates.java (original)
+++ hbase/branches/hbase-10070/hbase-server/src/main/java/org/apache/hadoop/hbase/master/RegionStates.java Wed Mar 12 23:26:17 2014
@@ -154,22 +154,12 @@ public class RegionStates {
Map<ServerName, List<HRegionInfo>> map = new HashMap<ServerName, List<HRegionInfo>>();
for (HRegionInfo region : regions) {
HRegionInfo defaultReplica = RegionReplicaUtil.getRegionInfoForDefaultReplica(region);
- ServerName server = regionAssignments.get(defaultReplica);
- List<HRegionInfo> regionsOnServer;
- if (server != null) {
- regionsOnServer = map.get(server);
- if (regionsOnServer == null) {
- regionsOnServer = new ArrayList<HRegionInfo>(1);
- map.put(server, regionsOnServer);
- }
- regionsOnServer.add(defaultReplica);
- }
Set<HRegionInfo> 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<HRegionInfo> regionsOnServer = map.get(server);
if (regionsOnServer == null) {
regionsOnServer = new ArrayList<HRegionInfo>(1);
map.put(server, regionsOnServer);