From 017a81551ee056c1e355df24712d5807cb0a528a Mon Sep 17 00:00:00 2001 From: Sakthi Date: Thu, 25 Apr 2019 19:26:51 -0700 Subject: [PATCH] HBASE-22086 [Addendum] space quota issue: deleting snapshot doesn't update the usage of table --- .../hadoop/hbase/quotas/TestQuotaTableUtil.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/quotas/TestQuotaTableUtil.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/quotas/TestQuotaTableUtil.java index 2fa22f55afb956d1e846bf07dcbe9f347b196883..fff833f7c7e598fe5d618afb2b03ebb2d462d0d8 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/quotas/TestQuotaTableUtil.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/quotas/TestQuotaTableUtil.java @@ -334,6 +334,8 @@ public class TestQuotaTableUtil { verifyTableSnapshotSize(quotaTable, tn2, "tn2snap0", 2048L); verifyTableSnapshotSize(quotaTable, tn2, "tn2snap1", 4096L); verifyTableSnapshotSize(quotaTable, tn2, "tn2snap2", 6144L); + + cleanUpSnapshotSizes(); } } @@ -350,6 +352,8 @@ public class TestQuotaTableUtil { assertEquals(1024L, QuotaTableUtil.getNamespaceSnapshotSize(connection, ns1)); assertEquals(2048L, QuotaTableUtil.getNamespaceSnapshotSize(connection, ns2)); assertEquals(8192L, QuotaTableUtil.getNamespaceSnapshotSize(connection, defaultNs)); + + cleanUpSnapshotSizes(); } } @@ -368,4 +372,14 @@ public class TestQuotaTableUtil { c.getValueArray(), c.getValueOffset(), c.getValueLength())).getQuotaUsage()); assertFalse(cs.advance()); } + + private void cleanUpSnapshotSizes() throws IOException { + try (Table t = connection.getTable(QuotaTableUtil.QUOTA_TABLE_NAME)) { + QuotaTableUtil.createDeletesForExistingTableSnapshotSizes(connection); + List deletes = + QuotaTableUtil.createDeletesForExistingNamespaceSnapshotSizes(connection); + deletes.addAll(QuotaTableUtil.createDeletesForExistingTableSnapshotSizes(connection)); + t.delete(deletes); + } + } } -- 2.20.1 (Apple Git-117)