You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by zg...@apache.org on 2020/07/16 01:01:00 UTC
[hbase] branch branch-2.2 updated: HBASE-24721: rename_rsgroup
overwriting the existing rsgroup
This is an automated email from the ASF dual-hosted git repository.
zghao pushed a commit to branch branch-2.2
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-2.2 by this push:
new 131a246 HBASE-24721: rename_rsgroup overwriting the existing rsgroup
131a246 is described below
commit 131a24614b4cf194cc29a527a9c176d3663de6f9
Author: Mohammad Arshad <ar...@apache.org>
AuthorDate: Wed Jul 15 18:27:15 2020 +0530
HBASE-24721: rename_rsgroup overwriting the existing rsgroup
Closes #2066
Signed-off-by: Reid Chan <re...@apache.org>
Signed-off-by: Viraj Jasani <vj...@apache.org>
---
.../hbase/rsgroup/RSGroupInfoManagerImpl.java | 3 ++
.../hadoop/hbase/rsgroup/TestRSGroupsAdmin1.java | 42 ++++++++++++++++++++++
2 files changed, 45 insertions(+)
diff --git a/hbase-rsgroup/src/main/java/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.java b/hbase-rsgroup/src/main/java/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.java
index bf2d2e2..7cdee4f 100644
--- a/hbase-rsgroup/src/main/java/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.java
+++ b/hbase-rsgroup/src/main/java/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.java
@@ -393,6 +393,9 @@ final class RSGroupInfoManagerImpl implements RSGroupInfoManager {
if (oldName.equals(RSGroupInfo.DEFAULT_GROUP)) {
throw new ConstraintException("Can't rename default rsgroup");
}
+ if (rsGroupMap.containsKey(newName)) {
+ throw new ConstraintException("Group already exists: " + newName);
+ }
RSGroupInfo oldGroup = getRSGroup(oldName);
Map<String,RSGroupInfo> newGroupMap = Maps.newHashMap(rsGroupMap);
diff --git a/hbase-rsgroup/src/test/java/org/apache/hadoop/hbase/rsgroup/TestRSGroupsAdmin1.java b/hbase-rsgroup/src/test/java/org/apache/hadoop/hbase/rsgroup/TestRSGroupsAdmin1.java
index 60e66bb..8a7da6c 100644
--- a/hbase-rsgroup/src/test/java/org/apache/hadoop/hbase/rsgroup/TestRSGroupsAdmin1.java
+++ b/hbase-rsgroup/src/test/java/org/apache/hadoop/hbase/rsgroup/TestRSGroupsAdmin1.java
@@ -19,6 +19,7 @@ package org.apache.hadoop.hbase.rsgroup;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
@@ -540,4 +541,45 @@ public class TestRSGroupsAdmin1 extends TestRSGroupsBase {
assertTrue(newgroup.containsTable(tb1));
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(oldGroupName, 2);
+ oldGroup = rsGroupAdmin.getRSGroupInfo(oldGroup.getName());
+ assertNotNull(oldGroup);
+ assertEquals(2, oldGroup.getServers().size());
+
+ //Add another RSGroup
+ String anotherRSGroupName = "anotherRSGroup";
+ RSGroupInfo anotherGroup = addGroup(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"));
+ }
+ }
}