You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2012/08/18 01:30:19 UTC
svn commit: r1374478 - in /hbase/trunk/hbase-server/src:
main/java/org/apache/hadoop/hbase/backup/example/
main/java/org/apache/hadoop/hbase/master/cleaner/
test/java/org/apache/hadoop/hbase/regionserver/
Author: stack
Date: Fri Aug 17 23:30:19 2012
New Revision: 1374478
URL: http://svn.apache.org/viewvc?rev=1374478&view=rev
Log:
HBASE-6055 Fix hfile/log cleaning delegate method naming
Modified:
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/example/LongTermArchivingHFileCleaner.java
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/cleaner/BaseLogCleanerDelegate.java
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/cleaner/CleanerChore.java
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/cleaner/FileCleanerDelegate.java
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/cleaner/TimeToLiveHFileCleaner.java
hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/CheckedArchivingHFileCleaner.java
Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/example/LongTermArchivingHFileCleaner.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/example/LongTermArchivingHFileCleaner.java?rev=1374478&r1=1374477&r2=1374478&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/example/LongTermArchivingHFileCleaner.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/example/LongTermArchivingHFileCleaner.java Fri Aug 17 23:30:19 2012
@@ -48,7 +48,7 @@ public class LongTermArchivingHFileClean
private FileSystem fs;
@Override
- public boolean isFileDeleteable(Path file) {
+ public boolean isFileDeletable(Path file) {
try {
FileStatus[] deleteStatus = FSUtils.listStatus(this.fs, file, null);
Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/cleaner/BaseLogCleanerDelegate.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/cleaner/BaseLogCleanerDelegate.java?rev=1374478&r1=1374477&r2=1374478&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/cleaner/BaseLogCleanerDelegate.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/cleaner/BaseLogCleanerDelegate.java Fri Aug 17 23:30:19 2012
@@ -40,17 +40,19 @@ import org.apache.hadoop.hbase.BaseConfi
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?
* <p>
- * 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
Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/cleaner/CleanerChore.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/cleaner/CleanerChore.java?rev=1374478&r1=1374477&r2=1374478&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/cleaner/CleanerChore.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/cleaner/CleanerChore.java Fri Aug 17 23:30:19 2012
@@ -210,7 +210,7 @@ public abstract class CleanerChore<T ext
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;
Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/cleaner/FileCleanerDelegate.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/cleaner/FileCleanerDelegate.java?rev=1374478&r1=1374477&r2=1374478&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/cleaner/FileCleanerDelegate.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/cleaner/FileCleanerDelegate.java Fri Aug 17 23:30:19 2012
@@ -35,6 +35,6 @@ public interface FileCleanerDelegate ext
* @param file full path to the file to check
* @return <tt>true</tt> if the file is deletable, <tt>false</tt> if not
*/
- public boolean isFileDeleteable(Path file);
+ public boolean isFileDeletable(Path file);
}
Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/cleaner/TimeToLiveHFileCleaner.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/cleaner/TimeToLiveHFileCleaner.java?rev=1374478&r1=1374477&r2=1374478&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/cleaner/TimeToLiveHFileCleaner.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/cleaner/TimeToLiveHFileCleaner.java Fri Aug 17 23:30:19 2012
@@ -50,7 +50,7 @@ public class TimeToLiveHFileCleaner exte
}
@Override
- public boolean isFileDeleteable(Path filePath) {
+ public boolean isFileDeletable(Path filePath) {
if (!instantiateFS()) {
return false;
}
Modified: hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/CheckedArchivingHFileCleaner.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/CheckedArchivingHFileCleaner.java?rev=1374478&r1=1374477&r2=1374478&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/CheckedArchivingHFileCleaner.java (original)
+++ hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/CheckedArchivingHFileCleaner.java Fri Aug 17 23:30:19 2012
@@ -31,7 +31,7 @@ public class CheckedArchivingHFileCleane
private static boolean checked;
@Override
- public boolean isFileDeleteable(Path file) {
+ public boolean isFileDeletable(Path file) {
checked = true;
return true;
}