Skip to content

HBASE-27878 Fix NPE in balancing rsgroup #8664

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
Huginn-kio wants to merge 1 commit into
base: master
Choose a base branch
from
+43 −27
Open

HBASE-27878 Fix NPE in balancing rsgroup #8664

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
38 changes: 15 additions & 23 deletions hbase-server/src/main/java/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1142,31 +1142,23 @@ private Map<String, RegionState> rsGroupGetRegionsInTransition(String groupName)
Map<TableName, Map<ServerName, List<RegionInfo>>> getRSGroupAssignmentsByTable(
TableStateManager tableStateManager, String groupName) throws IOException {
Map<TableName, Map<ServerName, List<RegionInfo>>> result = Maps.newHashMap();
Set<TableName> tablesInGroupCache = new HashSet<>();
for (Map.Entry<RegionInfo, ServerName> entry : masterServices.getAssignmentManager()
.getRegionStates().getRegionAssignments().entrySet()) {
RegionInfo region = entry.getKey();
TableName tn = region.getTable();
ServerName server = entry.getValue();
if (isTableInGroup(tn, groupName, tablesInGroupCache)) {
if (
tableStateManager.isTableState(tn, TableState.State.DISABLED, TableState.State.DISABLING)
) {
continue;
}
if (region.isSplitParent()) {
continue;
}
result.computeIfAbsent(tn, k -> new HashMap<>())
.computeIfAbsent(server, k -> new ArrayList<>()).add(region);
}
}
RSGroupInfo rsGroupInfo = getRSGroupInfo(groupName);
for (ServerName serverName : masterServices.getServerManager().getOnlineServers().keySet()) {
List<ServerName> onlineServersInGroup = new ArrayList<>();
for (ServerName serverName : masterServices.getServerManager().getOnlineServersList()) {
if (rsGroupInfo.containsServer(serverName.getAddress())) {
for (Map<ServerName, List<RegionInfo>> map : result.values()) {
map.computeIfAbsent(serverName, k -> Collections.emptyList());
}
onlineServersInGroup.add(serverName);
}
}
Map<TableName, Map<ServerName, List<RegionInfo>>> assignments = masterServices
.getAssignmentManager().getRegionStates()
.getAssignmentsForBalancer(tableStateManager, onlineServersInGroup);

Set<TableName> tablesInGroupCache = new HashSet<>();
for (Map.Entry<TableName, Map<ServerName, List<RegionInfo>>> entry : assignments.entrySet()) {
TableName tableName = entry.getKey();
if (isTableInGroup(tableName, groupName, tablesInGroupCache)) {
result.put(tableName, entry.getValue());
LOG.debug("Adding assignments for {}: {}", tableName, entry.getValue());
}
}
return result;
Expand Down
32 changes: 28 additions & 4 deletions hbase-server/src/test/java/org/apache/hadoop/hbase/rsgroup/TestRSGroupsBalance.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
import org.apache.hadoop.hbase.client.TableDescriptor;
import org.apache.hadoop.hbase.client.TableDescriptorBuilder;
import org.apache.hadoop.hbase.master.HMaster;
import org.apache.hadoop.hbase.master.assignment.RegionStateNode;
import org.apache.hadoop.hbase.testclassification.MediumTests;
import org.apache.hadoop.hbase.testclassification.RSGroupTests;
import org.apache.hadoop.hbase.util.Bytes;
Expand Down Expand Up @@ -222,9 +223,32 @@ public void testGetRSGroupAssignmentsByTable() throws Exception {

HMaster master = TEST_UTIL.getMiniHBaseCluster().getMaster();
RSGroupInfoManagerImpl gm = (RSGroupInfoManagerImpl) master.getRSGroupInfoManager();
Map<TableName, Map<ServerName, List<RegionInfo>>> assignments =
gm.getRSGroupAssignmentsByTable(master.getTableStateManager(), RSGroupInfo.DEFAULT_GROUP);
assertFalse(assignments.containsKey(disableTableName));
assertTrue(assignments.containsKey(tableName));
RegionInfo regionWithNullServer = ADMIN.getRegions(tableName).get(0);
RegionStateNode regionNode = master.getAssignmentManager()
.getRegionStates()
.getRegionStateNode(regionWithNullServer);
ServerName originalServer = setRegionLocation(regionNode, null);
try {
Map<TableName, Map<ServerName, List<RegionInfo>>> assignments =
gm.getRSGroupAssignmentsByTable(master.getTableStateManager(), RSGroupInfo.DEFAULT_GROUP);
assertFalse(assignments.containsKey(disableTableName));
assertTrue(assignments.containsKey(tableName));
assertFalse(assignments.get(tableName).containsKey(null));
assertFalse(assignments.get(tableName)
.values()
.stream()
.anyMatch(regions -> regions.contains(regionWithNullServer)));
} finally {
setRegionLocation(regionNode, originalServer);
}
}

private static ServerName setRegionLocation(RegionStateNode regionNode, ServerName serverName) {
regionNode.lock();
try {
return regionNode.setRegionLocation(serverName);
} finally {
regionNode.unlock();
}
}
}