You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by bi...@apache.org on 2019/12/20 07:13:58 UTC
[hbase] branch branch-2.2 updated: HBASE-23564 RegionStates may has
some expired serverinfo and make regions do not balance. (#930)
This is an automated email from the ASF dual-hosted git repository.
binlijin 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 5ec99b4 HBASE-23564 RegionStates may has some expired serverinfo and make regions do not balance. (#930)
5ec99b4 is described below
commit 5ec99b4f10213184eaecbe7901648a12f1a22608
Author: binlijin <bi...@gmail.com>
AuthorDate: Fri Dec 20 15:00:27 2019 +0800
HBASE-23564 RegionStates may has some expired serverinfo and make regions do not balance. (#930)
Signed-off-by: stack <st...@apache.org>
Signed-off-by: Wellington Chevreuil <wc...@apache.org>
---
.../java/org/apache/hadoop/hbase/master/HMaster.java | 3 ++-
.../hadoop/hbase/master/assignment/RegionStates.java | 17 +++++++++++------
...lancerWithDisabledTable.java => TestBalancer.java} | 19 ++++++++++++++-----
3 files changed, 27 insertions(+), 12 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 ef6f99f..90b8309 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
@@ -1698,7 +1698,8 @@ public class HMaster extends HRegionServer implements MasterServices {
boolean isByTable = getConfiguration().getBoolean("hbase.master.loadbalance.bytable", false);
Map<TableName, Map<ServerName, List<RegionInfo>>> assignments =
this.assignmentManager.getRegionStates()
- .getAssignmentsForBalancer(tableStateManager, isByTable);
+ .getAssignmentsForBalancer(tableStateManager, this.serverManager.getOnlineServersList(),
+ isByTable);
for (Map<ServerName, List<RegionInfo>> serverMap : assignments.values()) {
serverMap.keySet().removeAll(this.serverManager.getDrainingServersList());
}
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 ff81285..d3874a6 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
@@ -540,7 +540,7 @@ public class RegionStates {
* @return A clone of current assignments.
*/
public Map<TableName, Map<ServerName, List<RegionInfo>>> getAssignmentsForBalancer(
- TableStateManager tableStateManager, boolean isByTable) {
+ TableStateManager tableStateManager, List<ServerName> onlineServers, boolean isByTable) {
final Map<TableName, Map<ServerName, List<RegionInfo>>> result = new HashMap<>();
if (isByTable) {
for (RegionStateNode node : regionsMap.values()) {
@@ -560,16 +560,21 @@ public class RegionStates {
}
// Add online servers with no assignment for the table.
for (Map<ServerName, List<RegionInfo>> table : result.values()) {
- for (ServerName serverName : serverMap.keySet()) {
+ for (ServerName serverName : onlineServers) {
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().stream()
- .filter(region -> !isTableDisabled(tableStateManager, region.getTable()))
- .collect(Collectors.toList()));
+ for (ServerName serverName : onlineServers) {
+ ServerStateNode serverNode = serverMap.get(serverName);
+ if (serverNode != null) {
+ ensemble.put(serverNode.getServerName(), serverNode.getRegionInfoList().stream()
+ .filter(region -> !isTableDisabled(tableStateManager, region.getTable()))
+ .collect(Collectors.toList()));
+ } else {
+ ensemble.put(serverName, new ArrayList<>());
+ }
}
// Use a fake table name to represent the whole cluster's assignments
result.put(HConstants.ENSEMBLE_TABLE_NAME, ensemble);
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestBalancerWithDisabledTable.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestBalancer.java
similarity index 82%
rename from hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestBalancerWithDisabledTable.java
rename to hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestBalancer.java
index 190b54a..7d656fe 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestBalancerWithDisabledTable.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestBalancer.java
@@ -32,6 +32,7 @@ import org.apache.hadoop.hbase.ServerName;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.client.RegionInfo;
import org.apache.hadoop.hbase.master.assignment.AssignmentManager;
+import org.apache.hadoop.hbase.master.assignment.RegionStates;
import org.apache.hadoop.hbase.testclassification.LargeTests;
import org.apache.hadoop.hbase.testclassification.MasterTests;
import org.junit.After;
@@ -46,11 +47,11 @@ import org.junit.rules.TestName;
* Test balancer with disabled table
*/
@Category({ MasterTests.class, LargeTests.class })
-public class TestBalancerWithDisabledTable {
+public class TestBalancer {
@ClassRule
public static final HBaseClassTestRule CLASS_RULE =
- HBaseClassTestRule.forClass(TestBalancerWithDisabledTable.class);
+ HBaseClassTestRule.forClass(TestBalancer.class);
private final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
@@ -78,14 +79,21 @@ public class TestBalancerWithDisabledTable {
HMaster master = TEST_UTIL.getMiniHBaseCluster().getMaster();
AssignmentManager assignmentManager = master.getAssignmentManager();
+ RegionStates regionStates = assignmentManager.getRegionStates();
+ ServerName sn1 = ServerName.parseServerName("asf903.gq1.ygridcore.net,52690,1517835491385");
+ regionStates.getOrCreateServer(sn1);
+
TableStateManager tableStateManager = master.getTableStateManager();
+ ServerManager serverManager = master.getServerManager();
Map<TableName, Map<ServerName, List<RegionInfo>>> assignments =
- assignmentManager.getRegionStates().getAssignmentsForBalancer(tableStateManager, true);
+ assignmentManager.getRegionStates()
+ .getAssignmentsForBalancer(tableStateManager, serverManager.getOnlineServersList(), true);
assertFalse(assignments.containsKey(disableTableName));
assertTrue(assignments.containsKey(tableName));
+ assertFalse(assignments.get(tableName).containsKey(sn1));
- assignments =
- assignmentManager.getRegionStates().getAssignmentsForBalancer(tableStateManager, false);
+ assignments = assignmentManager.getRegionStates()
+ .getAssignmentsForBalancer(tableStateManager, serverManager.getOnlineServersList(), false);
Map<TableName, Map<ServerName, List<RegionInfo>>> tableNameMap = new HashMap<>();
for (Map.Entry<ServerName, List<RegionInfo>> entry : assignments
.get(HConstants.ENSEMBLE_TABLE_NAME).entrySet()) {
@@ -100,5 +108,6 @@ public class TestBalancerWithDisabledTable {
}
assertFalse(tableNameMap.containsKey(disableTableName));
assertTrue(tableNameMap.containsKey(tableName));
+ assertFalse(tableNameMap.get(tableName).containsKey(sn1));
}
}