You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by md...@apache.org on 2018/05/23 18:26:12 UTC
[12/14] hbase git commit: HBASE-20609 SnapshotHFileCleaner#init
should check that params is not null
HBASE-20609 SnapshotHFileCleaner#init should check that params is not null
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/6c1097e9
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/6c1097e9
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/6c1097e9
Branch: refs/heads/HBASE-20478
Commit: 6c1097e92fecbf8ef81f6e5d3217967abe94fb45
Parents: c9f8c34
Author: tedyu <yu...@gmail.com>
Authored: Mon May 21 18:36:38 2018 -0700
Committer: tedyu <yu...@gmail.com>
Committed: Mon May 21 18:36:38 2018 -0700
----------------------------------------------------------------------
.../apache/hadoop/hbase/master/snapshot/SnapshotHFileCleaner.java | 2 +-
.../java/org/apache/hadoop/hbase/backup/TestHFileArchiving.java | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/6c1097e9/hbase-server/src/main/java/org/apache/hadoop/hbase/master/snapshot/SnapshotHFileCleaner.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/snapshot/SnapshotHFileCleaner.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/snapshot/SnapshotHFileCleaner.java
index 559863e..7c866c2 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/snapshot/SnapshotHFileCleaner.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/snapshot/SnapshotHFileCleaner.java
@@ -76,7 +76,7 @@ public class SnapshotHFileCleaner extends BaseHFileCleanerDelegate {
@Override
public void init(Map<String, Object> params) {
- if (params.containsKey(HMaster.MASTER)) {
+ if (params != null && params.containsKey(HMaster.MASTER)) {
this.master = (MasterServices) params.get(HMaster.MASTER);
}
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/6c1097e9/hbase-server/src/test/java/org/apache/hadoop/hbase/backup/TestHFileArchiving.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/backup/TestHFileArchiving.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/backup/TestHFileArchiving.java
index 578724f..8666126 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/backup/TestHFileArchiving.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/backup/TestHFileArchiving.java
@@ -375,6 +375,7 @@ public class TestHFileArchiving {
// The cleaner should be looping without long pauses to reproduce the race condition.
HFileCleaner cleaner = new HFileCleaner(1, stoppable, conf, fs, archiveDir);
+ assertFalse("cleaner should not be null", cleaner == null);
try {
choreService.scheduleChore(cleaner);