(hbase) branch branch-3 updated: HBASE-29783 Fix flaky TestVerifyBucketCacheFile.testRetrieveFromFile test (#7561)

[wchevreuil]

This is an automated email from the ASF dual-hosted git repository.

wchevreuil pushed a commit to branch branch-3
in repository https://gitbox.apache.org/repos/asf/hbase.git


The following commit(s) were added to refs/heads/branch-3 by this push:
     new d5f3fd33b2e HBASE-29783 Fix flaky 
TestVerifyBucketCacheFile.testRetrieveFromFile test (#7561)
d5f3fd33b2e is described below

commit d5f3fd33b2e3f0cd370d243d39500f1c24452db2
Author: Wellington Ramos Chevreuil <wchevre...@apache.org>
AuthorDate: Fri Dec 19 10:21:58 2025 +0000

    HBASE-29783 Fix flaky TestVerifyBucketCacheFile.testRetrieveFromFile test 
(#7561)
    
    Signed-off-by: Peter Somogyi <psomo...@apache.org>
---
 .../hadoop/hbase/io/hfile/bucket/TestVerifyBucketCacheFile.java      | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

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
index 6207671989d..679b9098607 100644
--- 
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 class TestVerifyBucketCacheFile {
       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 @@ public class TestVerifyBucketCacheFile {
   }
 
   private void waitPersistentCacheValidation(Configuration config, final 
BucketCache bucketCache) {
-    Waiter.waitFor(config, 5000, () -> 
bucketCache.getBackingMapValidated().get());
+    Waiter.waitFor(config, 5000,
+      () -> bucketCache.getBackingMapValidated().get() && 
bucketCache.isCacheEnabled());
   }
 }