Skip to content

HBASE-29783 Fix flaky TestVerifyBucketCacheFile.testRetrieveFromFile test #7567

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
wchevreuil wants to merge 1 commit into
base: branch-2
Choose a base branch
from
+6 −5
Open

HBASE-29783 Fix flaky TestVerifyBucketCacheFile.testRetrieveFromFile test #7567

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
11 changes: 6 additions & 5 deletions ...rver/src/test/java/org/apache/hadoop/hbase/io/hfile/bucket/TestVerifyBucketCacheFile.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,10 +140,10 @@ public void testRetrieveFromFile() throws Exception {
FileSystems.getDefault().getPath(testDir.toString(), "bucket.cache");
assertTrue(Files.deleteIfExists(cacheFile));
// can't restore cache from file
recoveredBucketCache = new BucketCache("file:" + testDir + "/bucket.cache", capacitySize,
constructedBlockSize, constructedBlockSizes, writeThreads, writerQLen,
testDir + "/bucket.persistence" + name.getMethodName());
assertTrue(recoveredBucketCache.waitForCacheInitialization(10000));
recoveredBucketCache =
new BucketCache("file:" + testDir + "/bucket.cache", capacitySize, constructedBlockSize,
constructedBlockSizes, writeThreads, writerQLen, testDir + "/bucket.persistence");
waitPersistentCacheValidation(conf, bucketCache);
assertEquals(0, recoveredBucketCache.getAllocator().getUsedSize());
assertEquals(0, recoveredBucketCache.backingMap.size());
BlockCacheKey[] newKeys = CacheTestUtils.regenerateKeys(blocks, names);
Expand Down Expand Up @@ -512,6 +512,7 @@ private void cacheAndWaitUntilFlushedToBucket(BucketCache cache, BlockCacheKey c
}

private void waitPersistentCacheValidation(Configuration config, final BucketCache bucketCache) {
Waiter.waitFor(config, 5000, () -> bucketCache.getBackingMapValidated().get());
Waiter.waitFor(config, 5000,
() -> bucketCache.getBackingMapValidated().get() && bucketCache.isCacheEnabled());
}
}