HBASE-22146 SpaceQuotaViolationPolicy Disable is not working in Namespace level

Author: skochhar

hbase-server/src/main/java/org/apache/hadoop/hbase/namespace/NamespaceAuditor.java

@@ -18,6 +18,7 @@
 package org.apache.hadoop.hbase.namespace;
 
 import java.io.IOException;
+import java.util.Set;
 
 import org.apache.hadoop.hbase.HBaseIOException;
 import org.apache.hadoop.hbase.MetaTableAccessor;
@@ -141,6 +142,10 @@ public void addNamespace(NamespaceDescriptor ns) throws IOException {
 
   public void deleteNamespace(String namespace) throws IOException {
     stateManager.deleteNamespace(namespace);
+    Set<TableName> tableNameSet = getState(namespace).getTables();
+    for (TableName tableName: tableNameSet) {
+      removeFromNamespaceUsage(tableName);
+    }
   }
 
   public void removeFromNamespaceUsage(TableName tableName)

hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/QuotaUtil.java

@@ -267,6 +267,14 @@ private static void deleteQuotas(final Connection connection, final byte[] rowKe
       delete.addColumns(QUOTA_FAMILY_INFO, qualifier);
     }
     doDelete(connection, delete);
+    if (isNamespaceRowKey(rowKey)) {
+      TableName[] tableArray = connection.getAdmin().listTableNamesByNamespace(getNamespaceFromRowKey(rowKey));
+      for (TableName tableName: tableArray) {
+        if (QuotaUtil.getTableQuota(connection, tableName) == null) {
+          deleteTableQuota(connection,tableName);
+        }
+      }
+    }
   }
 
   public static Map<String, UserQuotaState> fetchUserQuotas(final Connection connection,

hbase-server/src/test/java/org/apache/hadoop/hbase/quotas/SpaceQuotaHelperForTests.java

@@ -158,6 +158,28 @@ TableName writeUntilViolation(SpaceViolationPolicy policyToViolate) throws Excep
     return tn;
   }
 
+
+  TableName writeUntilViolationAndVerifyViolationInNamespace(
+          String ns, SpaceViolationPolicy policyToViolate, Mutation m) throws Exception {
+    final TableName tn = writeUntilViolationInNamespace(ns, policyToViolate);
+    verifyViolation(policyToViolate, tn, m);
+    return tn;
+  }
+
+  TableName writeUntilViolationInNamespace(String ns, SpaceViolationPolicy policyToViolate) throws Exception {
+    TableName tn = createTableWithRegions(ns,10);
+
+    setQuotaLimit(ns, policyToViolate, 4L);
+
+    // Write more data than should be allowed and flush it to disk
+    writeData(tn, 5L * SpaceQuotaHelperForTests.ONE_MEGABYTE);
+
+    // This should be sufficient time for the chores to run and see the change.
+    Thread.sleep(5000);
+
+    return tn;
+  }
+
   /**
    * Verifies that the given policy on the given table has been violated
    */
@@ -271,6 +293,17 @@ void setQuotaLimit(final TableName tn, SpaceViolationPolicy policy, long sizeInM
     LOG.debug("Quota limit set for table = {}, limit = {}", tn, sizeLimit);
   }
 
+  /**
+   * Sets the given quota (policy & limit) on the passed namespace.
+   */
+  void setQuotaLimit(String ns, SpaceViolationPolicy policy, long sizeInMBs)
+          throws Exception {
+    final long sizeLimit = sizeInMBs * SpaceQuotaHelperForTests.ONE_MEGABYTE;
+    QuotaSettings settings = QuotaSettingsFactory.limitNamespaceSpace(ns, sizeLimit, policy);
+    testUtil.getAdmin().setQuota(settings);
+    LOG.debug("Quota limit set for namespace = {}, limit = {}", ns, sizeLimit);
+  }
+
   /**
    * Removes the space quota from the given table
    */
@@ -280,6 +313,16 @@ void removeQuotaFromtable(final TableName tn) throws Exception {
     LOG.debug("Space quota settings removed from the table ", tn);
   }
 
+  /**
+   * Removes the space quota from the given namespace
+   */
+  void removeQuotaFromNamespace(String ns) throws Exception {
+    QuotaSettings removeQuota = QuotaSettingsFactory.removeNamespaceSpaceLimit(ns);
+    Admin admin = testUtil.getAdmin();
+    admin.setQuota(removeQuota);
+    LOG.debug("Space quota settings removed from the namespace ", ns);
+  }
+
   /**
    * Removes all quotas defined in the HBase quota table.
    */

hbase-server/src/test/java/org/apache/hadoop/hbase/quotas/TestSpaceQuotaRemoval.java

@@ -20,6 +20,7 @@
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.hbase.HBaseClassTestRule;
 import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.NamespaceDescriptor;
 import org.apache.hadoop.hbase.TableName;
 import org.apache.hadoop.hbase.client.Put;
 import org.apache.hadoop.hbase.testclassification.LargeTests;
@@ -139,6 +140,28 @@ private void setQuotaAndThenRemove(SpaceViolationPolicy policy) throws Exception
     helper.verifyNoViolation(tn, put);
   }
 
+  @Test
+  public void testSetNamespaceSizeQuotaAndThenRemove() throws Exception {
+    Put put = new Put(Bytes.toBytes("to_reject"));
+    put.addColumn(Bytes.toBytes(SpaceQuotaHelperForTests.F1), Bytes.toBytes("to"),
+            Bytes.toBytes("reject"));
+
+    SpaceViolationPolicy policy = SpaceViolationPolicy.NO_INSERTS;
+
+    //Create namespace
+    NamespaceDescriptor nsd = helper.createNamespace();
+    String ns = nsd.getName();
+
+    // Do puts until we violate space policy on table tn1
+    final TableName tn1 = helper.writeUntilViolationAndVerifyViolationInNamespace(ns, policy, put);
+
+    // Now, remove the quota from namespace
+    helper.removeQuotaFromNamespace(ns);
+
+    // Put a new row now on tn1: should not violate as quota settings removed from namespace
+    helper.verifyNoViolation(tn1, put);
+  }
+
   private void setQuotaAndThenRemoveInOneAmongTwoTables(SpaceViolationPolicy policy)
       throws Exception {
     Put put = new Put(Bytes.toBytes("to_reject"));