diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/example/LongTermArchivingHFileCleaner.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/example/LongTermArchivingHFileCleaner.java index 58ffeccf557..e6ef05281a8 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/example/LongTermArchivingHFileCleaner.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/example/LongTermArchivingHFileCleaner.java @@ -48,7 +48,7 @@ public class LongTermArchivingHFileCleaner extends BaseHFileCleanerDelegate { private FileSystem fs; @Override - public boolean isFileDeleteable(Path file) { + public boolean isFileDeletable(Path file) { try { FileStatus[] deleteStatus = FSUtils.listStatus(this.fs, file, null); diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/cleaner/BaseLogCleanerDelegate.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/cleaner/BaseLogCleanerDelegate.java index c02a6bd9935..20f7cad002d 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/cleaner/BaseLogCleanerDelegate.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/cleaner/BaseLogCleanerDelegate.java @@ -40,17 +40,19 @@ import org.apache.hadoop.hbase.BaseConfigurable; public abstract class BaseLogCleanerDelegate extends BaseConfigurable implements FileCleanerDelegate { @Override - public boolean isFileDeleteable(Path file) { + public boolean isFileDeletable(Path file) { return isLogDeletable(file); } /** * Should the master delete the log or keep it? *
- * Implementing classes should override {@link #isFileDeleteable(Path)} instead.
+ * Implementing classes should override {@link #isFileDeletable(Path)} instead.
* @param filePath full path to log.
- * @return true if the log is deletable, false if not
+ * @return true if the log is deletable, false (default) if not
*/
@Deprecated
- public abstract boolean isLogDeletable(Path filePath);
+ public boolean isLogDeletable(Path filePath) {
+ return false;
+ }
}
\ No newline at end of file
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/cleaner/CleanerChore.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/cleaner/CleanerChore.java
index 8711c82529b..35974b73b07 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/cleaner/CleanerChore.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/cleaner/CleanerChore.java
@@ -210,7 +210,7 @@ public abstract class CleanerChore