HBASE-24096 Fix TestRSGroupsBalance (#1402)

Signed-off-by: Reid Chan <reidchan@apache.org> Signed-off-by: stack <stack@apache.org>
apache · Apr 1, 2020 · 52c1013 · 52c1013
1 parent 6f213e9
commit 52c1013
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.java
@@ -223,7 +223,7 @@ static class RSGroupMappingScript {
 
     String getRSGroup(String namespace, String tablename) {
       if (rsgroupMappingScript == null) {
-        return RSGroupInfo.DEFAULT_GROUP;
+        return null;
       }
       String[] exec = rsgroupMappingScript.getExecString();
       exec[1] = namespace;

diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/rsgroup/RSGroupUtil.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/rsgroup/RSGroupUtil.java
@@ -87,7 +87,10 @@ public static Optional<RSGroupInfo> getRSGroupInfo(MasterServices master,
     }
     // RSGroup information determined by administrator.
     String groupDeterminedByAdmin = manager.determineRSGroupInfoForTable(tableName);
-    RSGroupInfo groupInfo = manager.getRSGroup(groupDeterminedByAdmin);
+    RSGroupInfo groupInfo = null;
+    if (groupDeterminedByAdmin != null) {
+      groupInfo = manager.getRSGroup(groupDeterminedByAdmin);
+    }
     if (groupInfo != null) {
       return Optional.of(groupInfo);
     }