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

HBASE-18602 rsgroup cleanup unassign code 

Signed-off-by: Chia-Ping Tsai <chia7712@gmail.com>
This commit is contained in:
Wang, Xinglong 2017-10-31 03:04:34 +08:00 committed by Chia-Ping Tsai
parent 4ff957df08
commit ba2632b358
1 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hbase-rsgroup/src/main/java/org/apache/hadoop/hbase/rsgroup/RSGroupBasedLoadBalancer.java
View File

@ -25,7 +25,6 @@ import com.google.common.collect.LinkedListMultimap;
import com.google.common.collect.ListMultimap; import com.google.common.collect.ListMultimap;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
@ -37,10 +36,8 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import java.util.TreeMap; import java.util.TreeMap;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.ClusterStatus; import org.apache.hadoop.hbase.ClusterStatus;
import org.apache.hadoop.hbase.HBaseIOException; import org.apache.hadoop.hbase.HBaseIOException;
@ -350,7 +347,6 @@ public class RSGroupBasedLoadBalancer implements RSGroupableBalancer, LoadBalanc
Map<ServerName, List<HRegionInfo>> existingAssignments){ Map<ServerName, List<HRegionInfo>> existingAssignments){
Map<ServerName, List<HRegionInfo>> correctAssignments = Map<ServerName, List<HRegionInfo>> correctAssignments =
new TreeMap<ServerName, List<HRegionInfo>>(); new TreeMap<ServerName, List<HRegionInfo>>();
List<HRegionInfo> misplacedRegions = new LinkedList<HRegionInfo>();
correctAssignments.put(LoadBalancer.BOGUS_SERVER_NAME, new LinkedList<HRegionInfo>()); correctAssignments.put(LoadBalancer.BOGUS_SERVER_NAME, new LinkedList<HRegionInfo>());
for (Map.Entry<ServerName, List<HRegionInfo>> assignments : existingAssignments.entrySet()){ for (Map.Entry<ServerName, List<HRegionInfo>> assignments : existingAssignments.entrySet()){
ServerName sName = assignments.getKey(); ServerName sName = assignments.getKey();
@ -372,12 +368,6 @@ public class RSGroupBasedLoadBalancer implements RSGroupableBalancer, LoadBalanc
} }
} }
} }
//TODO bulk unassign?
//unassign misplaced regions, so that they are assigned to correct groups.
for(HRegionInfo info: misplacedRegions) {
this.masterServices.getAssignmentManager().unassign(info);
}
return correctAssignments; return correctAssignments;
} }