From 06ae2869e2fcd6ba764991b07e473e9268c6e9d0 Mon Sep 17 00:00:00 2001 From: "Wang, Xinglong" Date: Tue, 31 Oct 2017 03:02:57 +0800 Subject: [PATCH] HBASE-18602 rsgroup cleanup unassign code Signed-off-by: Chia-Ping Tsai --- .../hbase/rsgroup/RSGroupBasedLoadBalancer.java | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/hbase-rsgroup/src/main/java/org/apache/hadoop/hbase/rsgroup/RSGroupBasedLoadBalancer.java b/hbase-rsgroup/src/main/java/org/apache/hadoop/hbase/rsgroup/RSGroupBasedLoadBalancer.java index 68fd98baa5d..d838edb94c2 100644 --- a/hbase-rsgroup/src/main/java/org/apache/hadoop/hbase/rsgroup/RSGroupBasedLoadBalancer.java +++ b/hbase-rsgroup/src/main/java/org/apache/hadoop/hbase/rsgroup/RSGroupBasedLoadBalancer.java @@ -29,7 +29,6 @@ import java.util.List; import java.util.Map; import java.util.Set; import java.util.TreeMap; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; @@ -45,15 +44,14 @@ import org.apache.hadoop.hbase.master.MasterServices; import org.apache.hadoop.hbase.master.RegionPlan; import org.apache.hadoop.hbase.master.balancer.StochasticLoadBalancer; import org.apache.hadoop.hbase.net.Address; -import org.apache.hadoop.util.ReflectionUtils; -import org.apache.yetus.audience.InterfaceAudience; - import org.apache.hadoop.hbase.shaded.com.google.common.annotations.VisibleForTesting; import org.apache.hadoop.hbase.shaded.com.google.common.collect.ArrayListMultimap; import org.apache.hadoop.hbase.shaded.com.google.common.collect.LinkedListMultimap; import org.apache.hadoop.hbase.shaded.com.google.common.collect.ListMultimap; import org.apache.hadoop.hbase.shaded.com.google.common.collect.Lists; import org.apache.hadoop.hbase.shaded.com.google.common.collect.Maps; +import org.apache.hadoop.util.ReflectionUtils; +import org.apache.yetus.audience.InterfaceAudience; /** * GroupBasedLoadBalancer, used when Region Server Grouping is configured (HBase-6721) @@ -341,7 +339,6 @@ public class RSGroupBasedLoadBalancer implements RSGroupableBalancer { Map> existingAssignments) throws HBaseIOException{ Map> correctAssignments = new TreeMap<>(); - List misplacedRegions = new LinkedList<>(); correctAssignments.put(LoadBalancer.BOGUS_SERVER_NAME, new LinkedList<>()); for (Map.Entry> assignments : existingAssignments.entrySet()){ ServerName sName = assignments.getKey(); @@ -363,16 +360,6 @@ public class RSGroupBasedLoadBalancer implements RSGroupableBalancer { } } } - - //TODO bulk unassign? - //unassign misplaced regions, so that they are assigned to correct groups. - for(RegionInfo info: misplacedRegions) { - try { - this.masterServices.getAssignmentManager().unassign(info); - } catch (IOException e) { - throw new HBaseIOException(e); - } - } return correctAssignments; }