[hbase] branch branch-2.4 updated: HBASE-25680 Non-idempotent test in TestReplicationHFileCleaner (#2984)

[zhangduo]

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

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


The following commit(s) were added to refs/heads/branch-2.4 by this push:
     new 627e0d6  HBASE-25680  Non-idempotent test in 
TestReplicationHFileCleaner (#2984)
627e0d6 is described below

commit 627e0d61ba3a264dbdf273cba8c228f2949ec614
Author: lzx404243 <lzx404...@hotmail.com>
AuthorDate: Fri Aug 13 23:00:52 2021 -0400

    HBASE-25680  Non-idempotent test in TestReplicationHFileCleaner (#2984)
    
    Signed-off-by: Duo Zhang <zhang...@apache.org>
---
 .../apache/hadoop/hbase/master/cleaner/TestReplicationHFileCleaner.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/cleaner/TestReplicationHFileCleaner.java
 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/cleaner/TestReplicationHFileCleaner.java
index db5c7b2..fa36bfd 100644
--- 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/cleaner/TestReplicationHFileCleaner.java
+++ 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/cleaner/TestReplicationHFileCleaner.java
@@ -119,6 +119,8 @@ public class TestReplicationHFileCleaner {
     } catch (IOException e) {
       LOG.warn("Failed to delete files recursively from path " + root);
     }
+    // Remove all HFileRefs (if any)
+    rq.removeHFileRefs(peerId, rq.getReplicableHFiles(peerId));
     rp.getPeerStorage().removePeer(peerId);
   }