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 extends Chore return; } - if (!cleaner.isFileDeleteable(filePath)) { + if (!cleaner.isFileDeletable(filePath)) { // this file is not deletable, then we are done LOG.debug(filePath + " is not deletable according to:" + cleaner); return; diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/cleaner/FileCleanerDelegate.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/cleaner/FileCleanerDelegate.java index d4e10a374ad..ec5dc5e7edb 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/cleaner/FileCleanerDelegate.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/cleaner/FileCleanerDelegate.java @@ -35,6 +35,6 @@ public interface FileCleanerDelegate extends Configurable, Stoppable { * @param file full path to the file to check * @return true if the file is deletable, false if not */ - public boolean isFileDeleteable(Path file); + public boolean isFileDeletable(Path file); } diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/cleaner/TimeToLiveHFileCleaner.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/cleaner/TimeToLiveHFileCleaner.java index 1b883a7c314..dba4011bea8 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/cleaner/TimeToLiveHFileCleaner.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/cleaner/TimeToLiveHFileCleaner.java @@ -50,7 +50,7 @@ public class TimeToLiveHFileCleaner extends BaseHFileCleanerDelegate { } @Override - public boolean isFileDeleteable(Path filePath) { + public boolean isFileDeletable(Path filePath) { if (!instantiateFS()) { return false; } diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/CheckedArchivingHFileCleaner.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/CheckedArchivingHFileCleaner.java index 3136e0d8179..efc9cb654d0 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/CheckedArchivingHFileCleaner.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/CheckedArchivingHFileCleaner.java @@ -31,7 +31,7 @@ public class CheckedArchivingHFileCleaner extends BaseHFileCleanerDelegate { private static boolean checked; @Override - public boolean isFileDeleteable(Path file) { + public boolean isFileDeletable(Path file) { checked = true; return true; }