diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/cleaner/BaseHFileCleanerDelegate.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/cleaner/BaseHFileCleanerDelegate.java index 8de59bd1c96..d8a3f92fe67 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/cleaner/BaseHFileCleanerDelegate.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/cleaner/BaseHFileCleanerDelegate.java @@ -23,7 +23,7 @@ import org.apache.yetus.audience.InterfaceAudience; * Base class for the hfile cleaning function inside the master. By default, only the * {@link TimeToLiveHFileCleaner} is called. *

- * If other effects are needed, implement your own LogCleanerDelegate and add it to the + * If other effects are needed, implement your own HFileCleanerDelegate and add it to the * configuration "hbase.master.hfilecleaner.plugins", which is a comma-separated list of fully * qualified class names. The HFileCleaner will build the cleaner chain in * order the order specified by the configuration. 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 b1f9d0b4fb3..fcfeb79bee3 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 @@ -21,8 +21,9 @@ import org.apache.yetus.audience.InterfaceAudience; import org.apache.hadoop.fs.FileStatus; /** - * Base class for the log cleaning function inside the master. By default, two - * cleaners: TimeToLiveLogCleaner and + * Base class for the log cleaning function inside the master. By default, three + * cleaners: TimeToLiveLogCleaner, + * TimeToLiveProcedureWALCleaner and * ReplicationLogCleaner are called in order. So if other effects * are needed, implement your own LogCleanerDelegate and add it to the * configuration "hbase.master.logcleaner.plugins", which is a comma-separated @@ -40,18 +41,6 @@ public abstract class BaseLogCleanerDelegate extends BaseFileCleanerDelegate { @Override public boolean isFileDeletable(FileStatus fStat) { - return isLogDeletable(fStat); - } - - /** - * Should the master delete the log or keep it? - *

- * Implementing classes should override {@link #isFileDeletable(FileStatus)} instead. - * @param fStat file status of the file - * @return true if the log is deletable, false (default) if not - */ - @Deprecated - public boolean isLogDeletable(FileStatus fStat) { return false; } } diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/cleaner/TimeToLiveLogCleaner.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/cleaner/TimeToLiveLogCleaner.java index 7385273e71f..670bd8819f5 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/cleaner/TimeToLiveLogCleaner.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/cleaner/TimeToLiveLogCleaner.java @@ -41,7 +41,7 @@ public class TimeToLiveLogCleaner extends BaseLogCleanerDelegate { private boolean stopped = false; @Override - public boolean isLogDeletable(FileStatus fStat) { + public boolean isFileDeletable(FileStatus fStat) { // Files are validated for the second time here, // if it causes a bottleneck this logic needs refactored if (!AbstractFSWALProvider.validateWALFilename(fStat.getPath().getName())) {