Skip to content

HBASE-30303: Fix balancing for regions assigned through RSGroup fallback #8519

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Sigma-Ma wants to merge 1 commit into
base: master
Choose a base branch
from
+12 −3
Open

HBASE-30303: Fix balancing for regions assigned through RSGroup fallback #8519

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions hbase-server/src/main/java/org/apache/hadoop/hbase/rsgroup/RSGroupBasedLoadBalancer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,12 +322,18 @@ private List<ServerName> filterServers(Set<Address> servers, List<ServerName> on
} catch (IOException exp) {
LOG.debug("RSGroup information null for region of table " + tableName, exp);
}
List<ServerName> candidateServers = Collections.emptyList();
if (targetRSGInfo != null) {
List<ServerName> onlineServers = Lists.newArrayList(clusterLoad.keySet());
candidateServers = filterOfflineServers(targetRSGInfo, onlineServers);
if (isFallbackEnabled() && candidateServers.isEmpty()) {
candidateServers = getFallBackCandidates(onlineServers);
}
}
for (Map.Entry<ServerName, List<RegionInfo>> serverRegionMap : clusterLoad.entrySet()) {
ServerName currentHostServer = serverRegionMap.getKey();
List<RegionInfo> regionInfoList = serverRegionMap.getValue();
if (
targetRSGInfo == null || !targetRSGInfo.containsServer(currentHostServer.getAddress())
) {
if (!candidateServers.contains(currentHostServer)) {
regionInfoList.forEach(regionInfo -> {
regionPlansForMisplacedRegions.add(new RegionPlan(regionInfo, currentHostServer, null));
});
Expand Down
3 changes: 3 additions & 0 deletions hbase-server/src/test/java/org/apache/hadoop/hbase/rsgroup/TestRSGroupsFallback.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
*/
package org.apache.hadoop.hbase.rsgroup;

import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;

import java.io.IOException;
Expand Down Expand Up @@ -93,10 +94,12 @@ public void testFallback() throws Exception {
// server of test group crash, regions move to default group
crashRsInGroup(groupName);
assertRegionsInGroup(tableName, RSGroupInfo.DEFAULT_GROUP);
assertEquals(0, MASTER.balance().getMovesCalculated());

// server of default group crash, regions move to any other group
crashRsInGroup(RSGroupInfo.DEFAULT_GROUP);
assertRegionsInGroup(tableName, FALLBACK_GROUP);
assertEquals(0, MASTER.balance().getMovesCalculated());

// add a new server to default group, regions move to default group
TEST_UTIL.getMiniHBaseCluster().startRegionServerAndWait(60000);
Expand Down