Address review comments

apache · Apr 6, 2020 · 6105914 · 6105914
1 parent 9c473f0
commit 6105914
Show file tree

Hide file tree

Showing 2 changed files with 4 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
@@ -1233,7 +1233,7 @@ public synchronized void renameRSGroup(String oldName, String newName) throws IO
     Map<String, RSGroupInfo> newGroupMap = Maps.newHashMap(rsGroupMap);
     newGroupMap.remove(oldRSG.getName());
     RSGroupInfo newRSG = new RSGroupInfo(newName, oldRSG.getServers());
-    newGroupMap.put(newRSG.getName(), newRSG);
+    newGroupMap.put(newName, newRSG);
     flushConfig(newGroupMap);
 
     TableDescriptors tableDescriptors = masterServices.getTableDescriptors();

diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/rsgroup/TestRSGroupsAdmin1.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/rsgroup/TestRSGroupsAdmin1.java
@@ -476,7 +476,9 @@ public void testRenameRSGroup() throws Exception {
     TableName tb = TableName.valueOf("testRename");
     TEST_UTIL.createTable(tb, "tr");
     ADMIN.setRSGroup(Sets.newHashSet(tb), oldgroup.getName());
-    Thread.sleep(500);
+    TEST_UTIL.waitFor(1000,
+      (Waiter.Predicate<Exception>) () ->
+        ADMIN.getRSGroup("oldgroup").getServers().size() == 2);
     oldgroup = ADMIN.getRSGroup(oldgroup.getName());
     assertEquals(2, oldgroup.getServers().size());
     assertEquals(oldgroup.getName(), ADMIN.getRSGroup(tb).getName());