(hbase) branch branch-2.6 updated: HBASE-29345 Fix flaky testWALClosureFailureAndCleanup by waiting for lease recovery to complete (#7008)

[stoty]

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

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


The following commit(s) were added to refs/heads/branch-2.6 by this push:
     new f8f6ae2c401 HBASE-29345 Fix flaky testWALClosureFailureAndCleanup by 
waiting for lease recovery to complete (#7008)
f8f6ae2c401 is described below

commit f8f6ae2c401a7b41c79c20e3a8b466552d647f43
Author: vinayak hegde <vinayakph...@gmail.com>
AuthorDate: Wed May 28 14:22:27 2025 +0530

    HBASE-29345 Fix flaky testWALClosureFailureAndCleanup by waiting for lease 
recovery to complete (#7008)
    
    Signed-off-by: Istvan Toth <st...@apache.org>
    (cherry picked from commit 5a78ac9bd8b7e5e17c2a35b23e8e1627cf3a7999)
---
 .../java/org/apache/hadoop/hbase/regionserver/wal/TestFSHLog.java     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestFSHLog.java
 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestFSHLog.java
index ec2231b3f98..6f9ed7edcb2 100644
--- 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestFSHLog.java
+++ 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestFSHLog.java
@@ -375,11 +375,13 @@ public class TestFSHLog extends AbstractTestFSWAL {
         region.put(new Put(b).addColumn(b, b, b));
         log.rollWriter();
       }
-      assertEquals(2, log.getClosedErrorCount());
+
       region.put(new Put(b).addColumn(b, b, b));
       region.put(new Put(b).addColumn(b, b, b));
       region.flush(true);
       log.rollWriter();
+
+      TEST_UTIL.waitFor(10000, log.walFile2Props::isEmpty);
       assertEquals("WAL Files not cleaned ", 0, log.walFile2Props.size());
       region.close();
     }