Skip to content

HBASE-29862 Test case TestClearRegionBlockCache#testClearBlockCache failed #7697

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

Open
guluo2016 wants to merge 1 commit into
base: master
Choose a base branch
from
+25 −2
Open

HBASE-29862 Test case TestClearRegionBlockCache#testClearBlockCache failed #7697

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 25 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 @@ -1945,9 +1945,22 @@ public int evictBlocksRangeByHfileName(String hfileName, long initOffset, long e
}

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
return blocksByHFile.subSet(new BlockCacheKey(hfileName, init), true,
new BlockCacheKey(hfileName, end), true);
cacheKeys.addAll(blocksByHFile.subSet(new BlockCacheKey(hfileName, init), true,
new BlockCacheKey(hfileName, end), true));
return cacheKeys;
}

/**
Expand Down Expand Up @@ -2342,6 +2355,16 @@ public boolean hasBlocksForFile(String fileName) {
return delegate.keySet().stream().filter(key -> key.getHfileName().equals(fileName))
.findFirst().isPresent();
}

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;
}
}

public Map<BlockCacheKey, BucketEntry> getBackingMap() {
Expand Down