HBASE-29783 Fix flaky TestVerifyBucketCacheFile.testRetrieveFromFile test (#7561)

wchevreuil · wchevreuil · commit d5f3fd33b2e3 · 2025-12-19T10:58:57.000Z
Signed-off-by: Peter Somogyi &lt;psomogyi@apache.org&gt;
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/bucket/TestVerifyBucketCacheFile.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/bucket/TestVerifyBucketCacheFile.java
@@ -138,7 +138,7 @@ public void testRetrieveFromFile() throws Exception {
       recoveredBucketCache =
         new BucketCache("file:" + testDir + "/bucket.cache", capacitySize, constructedBlockSize,
           constructedBlockSizes, writeThreads, writerQLen, testDir + "/bucket.persistence");
-      assertTrue(recoveredBucketCache.waitForCacheInitialization(10000));
+      waitPersistentCacheValidation(conf, bucketCache);
       assertEquals(0, recoveredBucketCache.getAllocator().getUsedSize());
       assertEquals(0, recoveredBucketCache.backingMap.size());
       BlockCacheKey[] newKeys = CacheTestUtils.regenerateKeys(blocks, names);
@@ -494,6 +494,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());
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,7 @@ public void testRetrieveFromFile() throws Exception {`
`138`	`138`	`recoveredBucketCache =`
`139`	`139`	`new BucketCache("file:" + testDir + "/bucket.cache", capacitySize, constructedBlockSize,`
`140`	`140`	`constructedBlockSizes, writeThreads, writerQLen, testDir + "/bucket.persistence");`
`141`		`- assertTrue(recoveredBucketCache.waitForCacheInitialization(10000));`
	`141`	`+ waitPersistentCacheValidation(conf, bucketCache);`
`142`	`142`	`assertEquals(0, recoveredBucketCache.getAllocator().getUsedSize());`
`143`	`143`	`assertEquals(0, recoveredBucketCache.backingMap.size());`
`144`	`144`	`BlockCacheKey[] newKeys = CacheTestUtils.regenerateKeys(blocks, names);`
`@@ -494,6 +494,7 @@ private void cacheAndWaitUntilFlushedToBucket(BucketCache cache, BlockCacheKey c`
`494`	`494`	`}`
`495`	`495`
`496`	`496`	`private void waitPersistentCacheValidation(Configuration config, final BucketCache bucketCache) {`
`497`		`- Waiter.waitFor(config, 5000, () -> bucketCache.getBackingMapValidated().get());`
	`497`	`+ Waiter.waitFor(config, 5000,`
	`498`	`+ () -> bucketCache.getBackingMapValidated().get() && bucketCache.isCacheEnabled());`
`498`	`499`	`}`
`499`	`500`	`}`