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

[zh...@apache.org]

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

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


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

commit 4aec407c02d45f22db890c80de7af010fa0db275
Author: lzx404243 <lz...@hotmail.com>
AuthorDate: Fri Aug 13 23:00:52 2021 -0400

    HBASE-25680  Non-idempotent test in TestReplicationHFileCleaner (#2984)
    
    Signed-off-by: Duo Zhang <zh...@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 2b43734..bbb7f49 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
@@ -120,6 +120,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);
   }