HBASE-24654 Allow unset table's rsgroup

Author: ddupg

hbase-client/src/main/java/org/apache/hadoop/hbase/client/TableDescriptorBuilder.java

@@ -572,6 +572,11 @@ public TableDescriptorBuilder setRegionServerGroup(String group) {
     return this;
   }
 
+  public TableDescriptorBuilder clearRegionServerGroup() {
+    desc.removeValue(RSGROUP_KEY);
+    return this;
+  }
+
   public TableDescriptor build() {
     return new ModifyableTableDescriptor(desc);
   }

hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestTableDescriptorBuilder.java

@@ -19,6 +19,7 @@
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
@@ -27,6 +28,7 @@
 import org.apache.hadoop.hbase.HBaseClassTestRule;
 import org.apache.hadoop.hbase.TableName;
 import org.apache.hadoop.hbase.exceptions.DeserializationException;
+import org.apache.hadoop.hbase.rsgroup.RSGroupInfo;
 import org.apache.hadoop.hbase.testclassification.MiscTests;
 import org.apache.hadoop.hbase.testclassification.SmallTests;
 import org.apache.hadoop.hbase.util.BuilderStyleTest;
@@ -291,4 +293,14 @@ public void testStringCustomizedValues() {
         "{TABLE_ATTRIBUTES => {DURABILITY => 'ASYNC_WAL'}}, {NAME => 'cf', BLOCKSIZE => '1000'}",
       htd.toStringCustomizedValues());
   }
+
+  @Test
+  public void testGetSetRegionServerGroup() {
+    String groupName = name.getMethodName();
+    TableDescriptor htd = TableDescriptorBuilder.newBuilder(TableName.valueOf(name.getMethodName()))
+        .setRegionServerGroup(groupName).build();
+    assertEquals(htd.getValue(RSGroupInfo.TABLE_DESC_PROP_GROUP), groupName);
+    htd = TableDescriptorBuilder.newBuilder(htd).clearRegionServerGroup().build();
+    assertNull(htd.getValue(RSGroupInfo.TABLE_DESC_PROP_GROUP));
+  }
 }

hbase-server/src/test/java/org/apache/hadoop/hbase/rsgroup/TestRSGroupsAdmin1.java

@@ -586,4 +586,39 @@ public void testRenameRSGroupConstraints() throws Exception {
     }
 
   }
+
+  @Test
+  public void testTableConstraint() throws Exception {
+    String prefix = name.getMethodName();
+    String ns = prefix + "_ns";
+    TableName tableName = TableName.valueOf(ns + ":" + "t");
+    String nsGroup = prefix + "_nsg";
+    String tableGroup = prefix + "_tg";
+    addGroup(nsGroup, 1);
+    addGroup(tableGroup, 1);
+    ADMIN.createNamespace(NamespaceDescriptor.create(ns).build());
+    TEST_UTIL.createTable(tableName, "C");
+    TEST_UTIL.waitTableAvailable(tableName);
+    assertEquals(ADMIN.getRSGroup(tableName).getName(), RSGroupInfo.DEFAULT_GROUP);
+    // set table's rsgroup
+    TableDescriptor td = TableDescriptorBuilder.newBuilder(ADMIN.getDescriptor(tableName))
+        .setRegionServerGroup(tableGroup).build();
+    ADMIN.modifyTable(td);
+    TEST_UTIL.waitUntilNoRegionsInTransition();
+    assertEquals(ADMIN.getRSGroup(tableName).getName(), tableGroup);
+    // set namespace's rsgroup
+    NamespaceDescriptor nd = NamespaceDescriptor.create(ADMIN.getNamespaceDescriptor(ns))
+        .addConfiguration(RSGroupInfo.NAMESPACE_DESC_PROP_GROUP, nsGroup).build();
+    ADMIN.modifyNamespace(nd);
+    assertEquals(ADMIN.getRSGroup(tableName).getName(), tableGroup);
+    // clear table's rsgroup
+    td = TableDescriptorBuilder.newBuilder(ADMIN.getDescriptor(tableName))
+        .clearRegionServerGroup().build();
+    ADMIN.modifyTable(td);
+    TEST_UTIL.waitUntilNoRegionsInTransition();
+    assertEquals(ADMIN.getRSGroup(tableName).getName(), nsGroup);
+
+    TEST_UTIL.deleteTable(tableName);
+    ADMIN.deleteNamespace(ns);
+  }
 }