Skip to content

HBASE-29677: Thread safety in QuotaRefresherChore #7401

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 22, 2025
Merged

HBASE-29677: Thread safety in QuotaRefresherChore #7401

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d05966d
HBASE-29677: Thread safety in QuotaRefresherChore
charlesconnell Sep 17, 2025
6f3b60e
merge conflict
charlesconnell Oct 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
79 changes: 41 additions & 38 deletions hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/QuotaCache.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
import java.io.IOException;
import java.time.Duration;
import java.util.EnumSet;
import java.util.HashMap;
import java.util.Map;
import java.util.Optional;
import java.util.concurrent.ConcurrentHashMap;
Expand Down Expand Up @@ -70,10 +69,10 @@ public class QuotaCache implements Stoppable {
private final Object initializerLock = new Object();
private volatile boolean initialized = false;

private volatile Map<String, QuotaState> namespaceQuotaCache = new HashMap<>();
private volatile Map<TableName, QuotaState> tableQuotaCache = new HashMap<>();
private volatile Map<String, UserQuotaState> userQuotaCache = new HashMap<>();
private volatile Map<String, QuotaState> regionServerQuotaCache = new HashMap<>();
private volatile Map<String, QuotaState> namespaceQuotaCache = new ConcurrentHashMap<>();
private volatile Map<TableName, QuotaState> tableQuotaCache = new ConcurrentHashMap<>();
private volatile Map<String, UserQuotaState> userQuotaCache = new ConcurrentHashMap<>();
private volatile Map<String, QuotaState> regionServerQuotaCache = new ConcurrentHashMap<>();

private volatile boolean exceedThrottleQuotaEnabled = false;
// factors used to divide cluster scope quota into machine scope quota
Expand Down Expand Up @@ -310,44 +309,48 @@ public synchronized boolean triggerNow() {

@Override
protected void chore() {
updateQuotaFactors();
synchronized (this) {
LOG.info("Reloading quota cache from hbase:quota table");
updateQuotaFactors();

try {
Map<String, UserQuotaState> newUserQuotaCache =
new ConcurrentHashMap<>(fetchUserQuotaStateEntries());
updateNewCacheFromOld(userQuotaCache, newUserQuotaCache);
userQuotaCache = newUserQuotaCache;
} catch (IOException e) {
LOG.error("Error while fetching user quotas", e);
}

try {
Map<String, UserQuotaState> newUserQuotaCache = new HashMap<>(fetchUserQuotaStateEntries());
updateNewCacheFromOld(userQuotaCache, newUserQuotaCache);
userQuotaCache = newUserQuotaCache;
} catch (IOException e) {
LOG.error("Error while fetching user quotas", e);
}
try {
Map<String, QuotaState> newRegionServerQuotaCache =
new ConcurrentHashMap<>(fetchRegionServerQuotaStateEntries());
updateNewCacheFromOld(regionServerQuotaCache, newRegionServerQuotaCache);
regionServerQuotaCache = newRegionServerQuotaCache;
} catch (IOException e) {
LOG.error("Error while fetching region server quotas", e);
}

try {
Map<String, QuotaState> newRegionServerQuotaCache =
new HashMap<>(fetchRegionServerQuotaStateEntries());
updateNewCacheFromOld(regionServerQuotaCache, newRegionServerQuotaCache);
regionServerQuotaCache = newRegionServerQuotaCache;
} catch (IOException e) {
LOG.error("Error while fetching region server quotas", e);
}
try {
Map<TableName, QuotaState> newTableQuotaCache =
new ConcurrentHashMap<>(fetchTableQuotaStateEntries());
updateNewCacheFromOld(tableQuotaCache, newTableQuotaCache);
tableQuotaCache = newTableQuotaCache;
} catch (IOException e) {
LOG.error("Error while refreshing table quotas", e);
}

try {
Map<TableName, QuotaState> newTableQuotaCache =
new HashMap<>(fetchTableQuotaStateEntries());
updateNewCacheFromOld(tableQuotaCache, newTableQuotaCache);
tableQuotaCache = newTableQuotaCache;
} catch (IOException e) {
LOG.error("Error while refreshing table quotas", e);
}
try {
Map<String, QuotaState> newNamespaceQuotaCache =
new ConcurrentHashMap<>(fetchNamespaceQuotaStateEntries());
updateNewCacheFromOld(namespaceQuotaCache, newNamespaceQuotaCache);
namespaceQuotaCache = newNamespaceQuotaCache;
} catch (IOException e) {
LOG.error("Error while refreshing namespace quotas", e);
}

try {
Map<String, QuotaState> newNamespaceQuotaCache =
new HashMap<>(fetchNamespaceQuotaStateEntries());
updateNewCacheFromOld(namespaceQuotaCache, newNamespaceQuotaCache);
namespaceQuotaCache = newNamespaceQuotaCache;
} catch (IOException e) {
LOG.error("Error while refreshing namespace quotas", e);
fetchExceedThrottleQuota();
}

fetchExceedThrottleQuota();
}

private void fetchExceedThrottleQuota() {
Expand Down
46 changes: 46 additions & 0 deletions hbase-server/src/test/java/org/apache/hadoop/hbase/quotas/TestQuotaCache2.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,4 +131,50 @@ public void testForgetsDeletedQuota() {
assertTrue(newCache.containsKey("my_table2"));
assertFalse(newCache.containsKey("my_table1"));
}

@Test
public void testLearnsNewQuota() {
Map<String, QuotaState> oldCache = new HashMap<>();

QuotaState newState = new QuotaState();
Map<String, QuotaState> newCache = new HashMap<>();
newCache.put("my_table1", newState);

QuotaCache.updateNewCacheFromOld(oldCache, newCache);

assertTrue(newCache.containsKey("my_table1"));
}

@Test
public void testUserSpecificOverridesDefaultNewQuota() {
// establish old cache with a limiter for 100 read bytes per second
QuotaState oldState = new QuotaState();
Map<String, QuotaState> oldCache = new HashMap<>();
oldCache.put("my_table", oldState);
QuotaProtos.Throttle throttle1 = QuotaProtos.Throttle.newBuilder()
.setReadSize(QuotaProtos.TimedQuota.newBuilder().setTimeUnit(HBaseProtos.TimeUnit.SECONDS)
.setSoftLimit(100).setScope(QuotaProtos.QuotaScope.MACHINE).build())
.build();
QuotaLimiter limiter1 = TimeBasedLimiter.fromThrottle(conf, throttle1);
oldState.setGlobalLimiter(limiter1);

// establish new cache, with a limiter for 999 read bytes per second
QuotaState newState = new QuotaState();
Map<String, QuotaState> newCache = new HashMap<>();
newCache.put("my_table", newState);
QuotaProtos.Throttle throttle2 = QuotaProtos.Throttle.newBuilder()
.setReadSize(QuotaProtos.TimedQuota.newBuilder().setTimeUnit(HBaseProtos.TimeUnit.SECONDS)
.setSoftLimit(999).setScope(QuotaProtos.QuotaScope.MACHINE).build())
.build();
QuotaLimiter limiter2 = TimeBasedLimiter.fromThrottle(conf, throttle2);
newState.setGlobalLimiter(limiter2);

// update new cache from old cache
QuotaCache.updateNewCacheFromOld(oldCache, newCache);

// verify that the 999 available bytes from the limiter was carried over
TimeBasedLimiter updatedLimiter =
(TimeBasedLimiter) newCache.get("my_table").getGlobalLimiter();
assertEquals(999, updatedLimiter.getReadAvailable());
}
}