This is an automated email from the ASF dual-hosted git repository.
bbeaudreault pushed a commit to branch branch-3
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-3 by this push:
new 94651e3bd99 HBASE-28370 Default user quotas are refreshing too
frequently (#5686)
94651e3bd99 is described below
commit 94651e3bd997182a7a529ab13ab82959a2af7092
Author: Ray Mattingly <rmdmattin...@gmail.com>
AuthorDate: Mon Feb 19 15:32:00 2024 -0500
HBASE-28370 Default user quotas are refreshing too frequently (#5686)
Signed-off-by: Bryan Beaudreault <bbeaudrea...@apache.org>
---
.../org/apache/hadoop/hbase/quotas/QuotaCache.java | 12 ++-
.../org/apache/hadoop/hbase/quotas/QuotaUtil.java | 6 +-
.../apache/hadoop/hbase/quotas/TestQuotaCache.java | 89 ++++++++++++++++++++++
.../hadoop/hbase/quotas/ThrottleQuotaTestUtil.java | 12 +++
4 files changed, 115 insertions(+), 4 deletions(-)
diff --git
a/hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/QuotaCache.java
b/hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/QuotaCache.java
index 67b2aecc544..9b3498ff894 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/QuotaCache.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/QuotaCache.java
@@ -71,6 +71,8 @@ public class QuotaCache implements Stoppable {
// for testing purpose only, enforce the cache to be always refreshed
static boolean TEST_FORCE_REFRESH = false;
+ // for testing purpose only, block cache refreshes to reliably verify state
+ static boolean TEST_BLOCK_REFRESH = false;
private final ConcurrentMap<String, QuotaState> namespaceQuotaCache = new
ConcurrentHashMap<>();
private final ConcurrentMap<TableName, QuotaState> tableQuotaCache = new
ConcurrentHashMap<>();
@@ -138,7 +140,7 @@ public class QuotaCache implements Stoppable {
*/
public UserQuotaState getUserQuotaState(final UserGroupInformation ugi) {
return computeIfAbsent(userQuotaCache, getQuotaUserName(ugi),
- () ->
QuotaUtil.buildDefaultUserQuotaState(rsServices.getConfiguration()),
+ () ->
QuotaUtil.buildDefaultUserQuotaState(rsServices.getConfiguration(), 0L),
this::triggerCacheRefresh);
}
@@ -239,6 +241,14 @@ public class QuotaCache implements Stoppable {
@edu.umd.cs.findbugs.annotations.SuppressWarnings(value =
"GC_UNRELATED_TYPES",
justification = "I do not understand why the complaints, it looks good
to me -- FIX")
protected void chore() {
+ while (TEST_BLOCK_REFRESH) {
+ LOG.info("TEST_BLOCK_REFRESH=true, so blocking QuotaCache refresh
until it is false");
+ try {
+ Thread.sleep(10);
+ } catch (InterruptedException e) {
+ throw new RuntimeException(e);
+ }
+ }
// Prefetch online tables/namespaces
for (TableName table : ((HRegionServer)
QuotaCache.this.rsServices).getOnlineTables()) {
if (table.isSystemTable()) {
diff --git
a/hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/QuotaUtil.java
b/hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/QuotaUtil.java
index 44357c88d2d..0da1aa66165 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/QuotaUtil.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/QuotaUtil.java
@@ -334,7 +334,7 @@ public class QuotaUtil extends QuotaTableUtil {
String user = getUserFromRowKey(key);
if (results[i].isEmpty()) {
- userQuotas.put(user,
buildDefaultUserQuotaState(connection.getConfiguration()));
+ userQuotas.put(user,
buildDefaultUserQuotaState(connection.getConfiguration(), nowTs));
continue;
}
@@ -374,7 +374,7 @@ public class QuotaUtil extends QuotaTableUtil {
return userQuotas;
}
- protected static UserQuotaState buildDefaultUserQuotaState(Configuration
conf) {
+ protected static UserQuotaState buildDefaultUserQuotaState(Configuration
conf, long nowTs) {
QuotaProtos.Throttle.Builder throttleBuilder =
QuotaProtos.Throttle.newBuilder();
buildDefaultTimedQuota(conf, QUOTA_DEFAULT_USER_MACHINE_READ_NUM)
@@ -390,7 +390,7 @@ public class QuotaUtil extends QuotaTableUtil {
buildDefaultTimedQuota(conf, QUOTA_DEFAULT_USER_MACHINE_WRITE_SIZE)
.ifPresent(throttleBuilder::setWriteSize);
- UserQuotaState state = new UserQuotaState();
+ UserQuotaState state = new UserQuotaState(nowTs);
QuotaProtos.Quotas defaultQuotas =
QuotaProtos.Quotas.newBuilder().setThrottle(throttleBuilder.build()).build();
state.setQuotas(defaultQuotas);
diff --git
a/hbase-server/src/test/java/org/apache/hadoop/hbase/quotas/TestQuotaCache.java
b/hbase-server/src/test/java/org/apache/hadoop/hbase/quotas/TestQuotaCache.java
new file mode 100644
index 00000000000..89c77f43b35
--- /dev/null
+++
b/hbase-server/src/test/java/org/apache/hadoop/hbase/quotas/TestQuotaCache.java
@@ -0,0 +1,89 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.hadoop.hbase.quotas;
+
+import static
org.apache.hadoop.hbase.quotas.ThrottleQuotaTestUtil.waitMinuteQuota;
+import static org.junit.Assert.assertEquals;
+
+import org.apache.hadoop.hbase.HBaseClassTestRule;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
+import org.apache.hadoop.hbase.testclassification.MediumTests;
+import org.apache.hadoop.hbase.testclassification.RegionServerTests;
+import org.apache.hadoop.hbase.util.EnvironmentEdgeManager;
+import org.apache.hadoop.security.UserGroupInformation;
+import org.junit.After;
+import org.junit.BeforeClass;
+import org.junit.ClassRule;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+@Category({ RegionServerTests.class, MediumTests.class })
+public class TestQuotaCache {
+
+ @ClassRule
+ public static final HBaseClassTestRule CLASS_RULE =
+ HBaseClassTestRule.forClass(TestQuotaCache.class);
+
+ private static final HBaseTestingUtil TEST_UTIL = new HBaseTestingUtil();
+ private static final int REFRESH_TIME = 30_000;
+
+ @After
+ public void tearDown() throws Exception {
+ ThrottleQuotaTestUtil.clearQuotaCache(TEST_UTIL);
+ EnvironmentEdgeManager.reset();
+ TEST_UTIL.shutdownMiniCluster();
+ }
+
+ @BeforeClass
+ public static void setUpBeforeClass() throws Exception {
+ TEST_UTIL.getConfiguration().setBoolean(QuotaUtil.QUOTA_CONF_KEY, true);
+ TEST_UTIL.getConfiguration().setInt(QuotaCache.REFRESH_CONF_KEY,
REFRESH_TIME);
+
TEST_UTIL.getConfiguration().setInt(QuotaUtil.QUOTA_DEFAULT_USER_MACHINE_READ_NUM,
1000);
+
+ TEST_UTIL.startMiniCluster(1);
+ TEST_UTIL.waitTableAvailable(QuotaTableUtil.QUOTA_TABLE_NAME);
+ }
+
+ @Test
+ public void testDefaultUserRefreshFrequency() throws Exception {
+ QuotaCache.TEST_BLOCK_REFRESH = true;
+
+ QuotaCache quotaCache =
+ ThrottleQuotaTestUtil.getQuotaCaches(TEST_UTIL).stream().findAny().get();
+ UserGroupInformation ugi = UserGroupInformation.getCurrentUser();
+
+ UserQuotaState userQuotaState = quotaCache.getUserQuotaState(ugi);
+ assertEquals(userQuotaState.getLastUpdate(), 0);
+
+ QuotaCache.TEST_BLOCK_REFRESH = false;
+ // new user should have refreshed immediately
+ TEST_UTIL.waitFor(5_000, () -> userQuotaState.getLastUpdate() != 0);
+ long lastUpdate = userQuotaState.getLastUpdate();
+
+ // refresh should not apply to recently refreshed quota
+ quotaCache.triggerCacheRefresh();
+ Thread.sleep(250);
+ long newLastUpdate = userQuotaState.getLastUpdate();
+ assertEquals(lastUpdate, newLastUpdate);
+
+ quotaCache.triggerCacheRefresh();
+ waitMinuteQuota();
+ // should refresh after time has passed
+ TEST_UTIL.waitFor(5_000, () -> lastUpdate !=
userQuotaState.getLastUpdate());
+ }
+}
diff --git
a/hbase-server/src/test/java/org/apache/hadoop/hbase/quotas/ThrottleQuotaTestUtil.java
b/hbase-server/src/test/java/org/apache/hadoop/hbase/quotas/ThrottleQuotaTestUtil.java
index bc2d0ae0713..ff34c52386b 100644
---
a/hbase-server/src/test/java/org/apache/hadoop/hbase/quotas/ThrottleQuotaTestUtil.java
+++
b/hbase-server/src/test/java/org/apache/hadoop/hbase/quotas/ThrottleQuotaTestUtil.java
@@ -19,9 +19,11 @@ package org.apache.hadoop.hbase.quotas;
import java.io.IOException;
import java.util.ArrayList;
+import java.util.HashSet;
import java.util.List;
import java.util.Objects;
import java.util.Random;
+import java.util.Set;
import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.Waiter.ExplainingPredicate;
@@ -283,6 +285,16 @@ public final class ThrottleQuotaTestUtil {
}
}
+ static Set<QuotaCache> getQuotaCaches(HBaseTestingUtil testUtil) {
+ Set<QuotaCache> quotaCaches = new HashSet<>();
+ for (RegionServerThread rst :
testUtil.getMiniHBaseCluster().getRegionServerThreads()) {
+ RegionServerRpcQuotaManager quotaManager =
+ rst.getRegionServer().getRegionServerRpcQuotaManager();
+ quotaCaches.add(quotaManager.getQuotaCache());
+ }
+ return quotaCaches;
+ }
+
static void waitMinuteQuota() {
envEdge.incValue(70000);
}
