You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by zg...@apache.org on 2019/06/02 13:38:53 UTC
[hbase] branch branch-2.2 updated: HBASE-22523 Refactor
RegionStates#getAssignmentsByTable to make it easy to understand
This is an automated email from the ASF dual-hosted git repository.
zghao pushed a commit to branch branch-2.2
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-2.2 by this push:
new 9038697 HBASE-22523 Refactor RegionStates#getAssignmentsByTable to make it easy to understand
9038697 is described below
commit 9038697a68b7cfe70cd9f01efa4f641836fa73ce
Author: Guanghao <zg...@apache.org>
AuthorDate: Sun Jun 2 21:21:26 2019 +0800
HBASE-22523 Refactor RegionStates#getAssignmentsByTable to make it easy to understand
---
.../org/apache/hadoop/hbase/master/HMaster.java | 21 ++++---
.../hbase/master/assignment/RegionStates.java | 73 +++++++++-------------
2 files changed, 40 insertions(+), 54 deletions(-)
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
index c8796a2..4bd11a9 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
@@ -1711,21 +1711,22 @@ public class HMaster extends HRegionServer implements MasterServices {
}
boolean isByTable = getConfiguration().getBoolean("hbase.master.loadbalance.bytable", false);
- Map<TableName, Map<ServerName, List<RegionInfo>>> assignmentsByTable =
- this.assignmentManager.getRegionStates().getAssignmentsByTable(!isByTable);
-
- List<RegionPlan> plans = new ArrayList<>();
+ Map<TableName, Map<ServerName, List<RegionInfo>>> assignments =
+ this.assignmentManager.getRegionStates().getAssignmentsForBalancer(isByTable);
+ for (Map<ServerName, List<RegionInfo>> serverMap : assignments.values()) {
+ serverMap.keySet().removeAll(this.serverManager.getDrainingServersList());
+ }
//Give the balancer the current cluster state.
this.balancer.setClusterMetrics(getClusterMetricsWithoutCoprocessor());
- this.balancer.setClusterLoad(assignmentsByTable);
+ this.balancer.setClusterLoad(assignments);
- for (Map<ServerName, List<RegionInfo>> serverMap : assignmentsByTable.values()) {
- serverMap.keySet().removeAll(this.serverManager.getDrainingServersList());
- }
- for (Entry<TableName, Map<ServerName, List<RegionInfo>>> e : assignmentsByTable.entrySet()) {
+ List<RegionPlan> plans = new ArrayList<>();
+ for (Entry<TableName, Map<ServerName, List<RegionInfo>>> e : assignments.entrySet()) {
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();
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/RegionStates.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/RegionStates.java
index 1470a5a..4728d1f 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/RegionStates.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/RegionStates.java
@@ -528,55 +528,40 @@ public class RegionStates {
* 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
* 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(
- final boolean forceByCluster) {
- 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() {
+ public Map<TableName, Map<ServerName, List<RegionInfo>>> getAssignmentsForBalancer(
+ boolean isByTable) {
final Map<TableName, Map<ServerName, List<RegionInfo>>> result = new HashMap<>();
- for (RegionStateNode node: regionsMap.values()) {
- Map<ServerName, List<RegionInfo>> tableResult = result.get(node.getTable());
- if (tableResult == null) {
- tableResult = new HashMap<ServerName, List<RegionInfo>>();
- result.put(node.getTable(), tableResult);
+ if (isByTable) {
+ for (RegionStateNode node : regionsMap.values()) {
+ Map<ServerName, List<RegionInfo>> tableResult =
+ result.computeIfAbsent(node.getTable(), t -> new HashMap<>());
+ final ServerName serverName = node.getRegionLocation();
+ if (serverName == null) {
+ LOG.info("Skipping, no server for " + node);
+ continue;
+ }
+ List<RegionInfo> serverResult =
+ tableResult.computeIfAbsent(serverName, s -> new ArrayList<>());
+ serverResult.add(node.getRegionInfo());
}
-
- final ServerName serverName = node.getRegionLocation();
- if (serverName == null) {
- LOG.info("Skipping, no server for " + node);
- continue;
+ // 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<>());
+ }
}
- List<RegionInfo> serverResult = tableResult.get(serverName);
- if (serverResult == null) {
- serverResult = new ArrayList<RegionInfo>();
- tableResult.put(serverName, serverResult);
+ } else {
+ final HashMap<ServerName, List<RegionInfo>> ensemble = new HashMap<>(serverMap.size());
+ for (ServerStateNode serverNode : serverMap.values()) {
+ ensemble.put(serverNode.getServerName(), serverNode.getRegionInfoList());
}
-
- 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>());
- }
- }
+ // Use a fake table name to represent the whole cluster's assignments
+ result.put(HConstants.ENSEMBLE_TABLE_NAME, ensemble);
}
return result;
}