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

HBASE-24096 Fix TestRSGroupsBalance (#1402) 

Signed-off-by: Reid Chan <reidchan@apache.org>
Signed-off-by: stack <stack@apache.org>
This commit is contained in:
binlijin 2020-04-01 14:16:57 +08:00 committed by GitHub
parent 6f213e9d5a
commit 52c101389e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hbase-server/src/main/java/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.java
View File

@ -223,7 +223,7 @@ final class RSGroupInfoManagerImpl implements RSGroupInfoManager {
String getRSGroup(String namespace, String tablename) { String getRSGroup(String namespace, String tablename) {
if (rsgroupMappingScript == null) { if (rsgroupMappingScript == null) {
return RSGroupInfo.DEFAULT_GROUP; return null;
} }
String[] exec = rsgroupMappingScript.getExecString(); String[] exec = rsgroupMappingScript.getExecString();
exec[1] = namespace; exec[1] = namespace;

5
hbase-server/src/main/java/org/apache/hadoop/hbase/rsgroup/RSGroupUtil.java
View File

@ -87,7 +87,10 @@ public final class RSGroupUtil {
} }
// RSGroup information determined by administrator. // RSGroup information determined by administrator.
String groupDeterminedByAdmin = manager.determineRSGroupInfoForTable(tableName); String groupDeterminedByAdmin = manager.determineRSGroupInfoForTable(tableName);
RSGroupInfo groupInfo = manager.getRSGroup(groupDeterminedByAdmin); RSGroupInfo groupInfo = null;
if (groupDeterminedByAdmin != null) {
groupInfo = manager.getRSGroup(groupDeterminedByAdmin);
}
if (groupInfo != null) { if (groupInfo != null) {
return Optional.of(groupInfo); return Optional.of(groupInfo);
} }