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

HBASE-22523 Refactor RegionStates#getAssignmentsByTable to make it easy to understand

This commit is contained in:
Guanghao 2019-06-02 21:21:26 +08:00 committed by Guanghao Zhang
parent c5bf670562
commit b64fdd956c
2 changed files with 42 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
View File

@ -1648,21 +1648,22 @@ public class HMaster extends HRegionServer implements MasterServices {
} }
boolean isByTable = getConfiguration().getBoolean("hbase.master.loadbalance.bytable", false); boolean isByTable = getConfiguration().getBoolean("hbase.master.loadbalance.bytable", false);
Map<TableName, Map<ServerName, List<RegionInfo>>> assignmentsByTable = Map<TableName, Map<ServerName, List<RegionInfo>>> assignments =
this.assignmentManager.getRegionStates().getAssignmentsByTable(!isByTable); this.assignmentManager.getRegionStates().getAssignmentsForBalancer(isByTable);
for (Map<ServerName, List<RegionInfo>> serverMap : assignments.values()) {
List<RegionPlan> plans = new ArrayList<>(); serverMap.keySet().removeAll(this.serverManager.getDrainingServersList());
}
//Give the balancer the current cluster state. //Give the balancer the current cluster state.
this.balancer.setClusterMetrics(getClusterMetricsWithoutCoprocessor()); this.balancer.setClusterMetrics(getClusterMetricsWithoutCoprocessor());
this.balancer.setClusterLoad(assignmentsByTable); this.balancer.setClusterLoad(assignments);
for (Map<ServerName, List<RegionInfo>> serverMap : assignmentsByTable.values()) { List<RegionPlan> plans = new ArrayList<>();
serverMap.keySet().removeAll(this.serverManager.getDrainingServersList()); for (Entry<TableName, Map<ServerName, List<RegionInfo>>> e : assignments.entrySet()) {
}
for (Entry<TableName, Map<ServerName, List<RegionInfo>>> e : assignmentsByTable.entrySet()) {
List<RegionPlan> partialPlans = this.balancer.balanceCluster(e.getKey(), e.getValue()); List<RegionPlan> partialPlans = this.balancer.balanceCluster(e.getKey(), e.getValue());
if (partialPlans != null) plans.addAll(partialPlans); if (partialPlans != null) {
plans.addAll(partialPlans);
}
} }
long balanceStartTime = System.currentTimeMillis(); long balanceStartTime = System.currentTimeMillis();

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

@ -896,55 +896,40 @@ public class RegionStates {
* Can't let out original since it can change and at least the load balancer * Can't let out original since it can change and at least the load balancer
* wants to iterate this exported list. We need to synchronize on regions * wants to iterate this exported list. We need to synchronize on regions
* since all access to this.servers is under a lock on this.regions. * since all access to this.servers is under a lock on this.regions.
* @param forceByCluster a flag to force to aggregate the server-load to the cluster level *
* @return A clone of current assignments by table. * @param isByTable If <code>true</code>, return the assignments by table. If <code>false</code>,
* return the assignments which aggregate the server-load to the cluster level.
* @return A clone of current assignments.
*/ */
public Map<TableName, Map<ServerName, List<RegionInfo>>> getAssignmentsByTable( public Map<TableName, Map<ServerName, List<RegionInfo>>> getAssignmentsForBalancer(
final boolean forceByCluster) { boolean isByTable) {
if (!forceByCluster) return getAssignmentsByTable();
final HashMap<ServerName, List<RegionInfo>> ensemble =
new HashMap<ServerName, List<RegionInfo>>(serverMap.size());
for (ServerStateNode serverNode: serverMap.values()) {
ensemble.put(serverNode.getServerName(), serverNode.getRegionInfoList());
}
// TODO: can we use Collections.singletonMap(HConstants.ENSEMBLE_TABLE_NAME, ensemble)?
final Map<TableName, Map<ServerName, List<RegionInfo>>> result =
new HashMap<TableName, Map<ServerName, List<RegionInfo>>>(1);
result.put(HConstants.ENSEMBLE_TABLE_NAME, ensemble);
return result;
}
public Map<TableName, Map<ServerName, List<RegionInfo>>> getAssignmentsByTable() {
final Map<TableName, Map<ServerName, List<RegionInfo>>> result = new HashMap<>(); final Map<TableName, Map<ServerName, List<RegionInfo>>> result = new HashMap<>();
for (RegionStateNode node: regionsMap.values()) { if (isByTable) {
Map<ServerName, List<RegionInfo>> tableResult = result.get(node.getTable()); for (RegionStateNode node : regionsMap.values()) {
if (tableResult == null) { Map<ServerName, List<RegionInfo>> tableResult =
tableResult = new HashMap<ServerName, List<RegionInfo>>(); result.computeIfAbsent(node.getTable(), t -> new HashMap<>());
result.put(node.getTable(), tableResult); final ServerName serverName = node.getRegionLocation();
} if (serverName == null) {
LOG.info("Skipping, no server for " + node);
final ServerName serverName = node.getRegionLocation(); continue;
if (serverName == null) {
LOG.info("Skipping, no server for " + node);
continue;
}
List<RegionInfo> serverResult = tableResult.get(serverName);
if (serverResult == null) {
serverResult = new ArrayList<RegionInfo>();
tableResult.put(serverName, serverResult);
}
serverResult.add(node.getRegionInfo());
}
// Add online servers with no assignment for the table.
for (Map<ServerName, List<RegionInfo>> table: result.values()) {
for (ServerName svr : serverMap.keySet()) {
if (!table.containsKey(svr)) {
table.put(svr, new ArrayList<RegionInfo>());
}
} }
List<RegionInfo> serverResult =
tableResult.computeIfAbsent(serverName, s -> new ArrayList<>());
serverResult.add(node.getRegionInfo());
}
// Add online servers with no assignment for the table.
for (Map<ServerName, List<RegionInfo>> table : result.values()) {
for (ServerName serverName : serverMap.keySet()) {
table.putIfAbsent(serverName, new ArrayList<>());
}
}
} else {
final HashMap<ServerName, List<RegionInfo>> ensemble = new HashMap<>(serverMap.size());
for (ServerStateNode serverNode : serverMap.values()) {
ensemble.put(serverNode.getServerName(), serverNode.getRegionInfoList());
}
// Use a fake table name to represent the whole cluster's assignments
result.put(HConstants.ENSEMBLE_TABLE_NAME, ensemble);
} }
return result; return result;
} }