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

HBASE-24721: rename_rsgroup overwriting the existing rsgroup 

Closes #2066

Co-authored-by: Viraj Jasani <vjasani@apache.org>

Signed-off-by: Reid Chan <reidchan@apache.org>
Signed-off-by: Viraj Jasani <vjasani@apache.org>
This commit is contained in:
Mohammad Arshad 2020-07-15 18:27:15 +05:30 committed by Viraj Jasani
parent e5b2334124
commit f5080eb9a6
No known key found for this signature in database
GPG Key ID: B3D6C0B41C8ADFD5
2 changed files with 45 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -850,6 +850,9 @@ public class RSGroupInfoManagerImpl implements RSGroupInfoManager, ServerListene
if (oldName.equals(RSGroupInfo.DEFAULT_GROUP)) { if (oldName.equals(RSGroupInfo.DEFAULT_GROUP)) {
throw new ConstraintException("Can't rename default rsgroup"); throw new ConstraintException("Can't rename default rsgroup");
} }
if (rsGroupMap.containsKey(newName)) {
throw new ConstraintException("Group already exists: " + newName);
}
RSGroupInfo oldGroup = getRSGroup(oldName); RSGroupInfo oldGroup = getRSGroup(oldName);
Map<String,RSGroupInfo> newGroupMap = Maps.newHashMap(rsGroupMap); Map<String,RSGroupInfo> newGroupMap = Maps.newHashMap(rsGroupMap);

42
hbase-rsgroup/src/test/java/org/apache/hadoop/hbase/rsgroup/TestRSGroupsAdmin1.java
View File

@ -21,6 +21,7 @@ package org.apache.hadoop.hbase.rsgroup;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull; import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail; import static org.junit.Assert.fail;
@ -519,4 +520,45 @@ public class TestRSGroupsAdmin1 extends TestRSGroupsBase {
assertTrue(newgroup.containsTable(tb1)); assertTrue(newgroup.containsTable(tb1));
assertEquals(normal.getName(), rsGroupAdmin.getRSGroupInfoOfTable(tb2).getName()); assertEquals(normal.getName(), rsGroupAdmin.getRSGroupInfoOfTable(tb2).getName());
} }
@Test
public void testRenameRSGroupConstraints() throws Exception {
// Add RSGroup, and assign 2 servers and a table to it.
String oldGroupName = "oldGroup";
RSGroupInfo oldGroup = addGroup(rsGroupAdmin, oldGroupName, 2);
oldGroup = rsGroupAdmin.getRSGroupInfo(oldGroup.getName());
assertNotNull(oldGroup);
assertEquals(2, oldGroup.getServers().size());
//Add another RSGroup
String anotherRSGroupName = "anotherRSGroup";
RSGroupInfo anotherGroup = addGroup(rsGroupAdmin, anotherRSGroupName, 1);
anotherGroup = rsGroupAdmin.getRSGroupInfo(anotherGroup.getName());
assertNotNull(anotherGroup);
assertEquals(1, anotherGroup.getServers().size());
//Rename to existing group
try {
rsGroupAdmin.renameRSGroup(oldGroup.getName(), anotherRSGroupName);
fail("ConstraintException was expected.");
} catch (ConstraintException e) {
assertTrue(e.getMessage().contains("Group already exists"));
}
//Rename default RSGroup
try {
rsGroupAdmin.renameRSGroup(RSGroupInfo.DEFAULT_GROUP, "newRSGroup2");
fail("ConstraintException was expected.");
} catch (ConstraintException e) {
//Do nothing
}
//Rename to default RSGroup
try {
rsGroupAdmin.renameRSGroup(oldGroup.getName(), RSGroupInfo.DEFAULT_GROUP);
fail("ConstraintException was expected.");
} catch (ConstraintException e) {
assertTrue(e.getMessage().contains("Group already exists"));
}
}
} }