You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by el...@apache.org on 2018/12/07 22:28:59 UTC
[16/51] [abbrv] hbase git commit: HBASE-21387 Addendum fix
TestSnapshotFileCache
HBASE-21387 Addendum fix TestSnapshotFileCache
Signed-off-by: zhangduo <zh...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/d9c773b0
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/d9c773b0
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/d9c773b0
Branch: refs/heads/HBASE-20952
Commit: d9c773b0a5689f746c0e45c914b455765540df15
Parents: 6d0dc96
Author: Ted Yu <yu...@gmail.com>
Authored: Sat Nov 24 17:00:08 2018 +0800
Committer: zhangduo <zh...@apache.org>
Committed: Sat Nov 24 17:00:08 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/d9c773b0/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 006ca2a..522b1c9 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;