Repository: hbase Updated Branches: refs/heads/branch-1.4 30790ca78 -> e95fdc5fe
HBASE-21387 Addendum fix TestSnapshotFileCache Signed-off-by: zhangduo <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/e95fdc5f Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/e95fdc5f Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/e95fdc5f Branch: refs/heads/branch-1.4 Commit: e95fdc5fea9f50306b8b5c7d611d05f6b366839b Parents: 30790ca Author: Ted Yu <[email protected]> Authored: Sat Nov 24 17:00:08 2018 +0800 Committer: zhangduo <[email protected]> Committed: Sat Nov 24 17:04:36 2018 +0800 ---------------------------------------------------------------------- .../org/apache/hadoop/hbase/master/snapshot/SnapshotFileCache.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/e95fdc5f/hbase-server/src/main/java/org/apache/hadoop/hbase/master/snapshot/SnapshotFileCache.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/snapshot/SnapshotFileCache.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/snapshot/SnapshotFileCache.java index 08efe01..a1d382b 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/snapshot/SnapshotFileCache.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/snapshot/SnapshotFileCache.java @@ -190,7 +190,7 @@ public class SnapshotFileCache implements Stoppable { } if (lock == null || lock.tryLock()) { try { - if (snapshotManager == null || snapshotManager.isTakingAnySnapshot()) { + if (snapshotManager != null && snapshotManager.isTakingAnySnapshot()) { LOG.warn("Not checking unreferenced files since snapshot is running, it will " + "skip to clean the HFiles this time"); return unReferencedFiles;
