Skip to content

HBASE-29862 Test case TestClearRegionBlockCache#testClearBlockCache failed (branch-2.5) #7820

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
Apache9 merged 2 commits into from
Mar 1, 2026
Merged

HBASE-29862 Test case TestClearRegionBlockCache#testClearBlockCache failed (branch-2.5) #7820

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f6defff
HBASE-29862 Test case TestClearRegionBlockCache#testClearBlockCache f…
guluo2016 Feb 28, 2026
327903e
mvn spotless:apply
guluo2016 Feb 28, 2026
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
33 changes: 31 additions & 2 deletions hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/bucket/BucketCache.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1420,8 +1420,7 @@ protected String getAlgorithm() {
*/
@Override
public int evictBlocksByHfileName(String hfileName) {
Set<BlockCacheKey> keySet = blocksByHFile.subSet(new BlockCacheKey(hfileName, Long.MIN_VALUE),
true, new BlockCacheKey(hfileName, Long.MAX_VALUE), true);
Set<BlockCacheKey> keySet = getAllCacheKeysForFile(hfileName, 0L, Long.MAX_VALUE);

int numEvicted = 0;
for (BlockCacheKey key : keySet) {
Expand All @@ -1433,6 +1432,25 @@ public int evictBlocksByHfileName(String hfileName) {
return numEvicted;
}

private Set<BlockCacheKey> getAllCacheKeysForFile(String hfileName, long init, long end) {
Set<BlockCacheKey> cacheKeys = new HashSet<>();
// At this moment, Some Bucket Entries may be in the WriterThread queue, and not yet put into
// the backingMap. So, when executing this method, we should check both the RAMCache and
// backingMap to ensure all CacheKeys are obtained.
// For more details, please refer to HBASE-29862.
Set<BlockCacheKey> ramCacheKeySet = ramCache.getRamBlockCacheKeysForHFile(hfileName);
for (BlockCacheKey key : ramCacheKeySet) {
if (key.getOffset() >= init && key.getOffset() <= end) {
cacheKeys.add(key);
}
}

// These keys are just for comparison and are short lived, so we need only file name and offset
cacheKeys.addAll(blocksByHFile.subSet(new BlockCacheKey(hfileName, init), true,
new BlockCacheKey(hfileName, end), true));
return cacheKeys;
}

/**
* Used to group bucket entries into priority buckets. There will be a BucketEntryGroup for each
* priority (single, multi, memory). Once bucketed, the eviction algorithm takes the appropriate
Expand Down Expand Up @@ -1770,5 +1788,16 @@ public void clear() {
re.getData().release();
}
}

public Set<BlockCacheKey> getRamBlockCacheKeysForHFile(String fileName) {
Set<BlockCacheKey> ramCacheKeySet = new HashSet<>();
for (BlockCacheKey blockCacheKey : delegate.keySet()) {
if (blockCacheKey.getHfileName().equals(fileName)) {
ramCacheKeySet.add(blockCacheKey);
}
}

return ramCacheKeySet;
}
}
}