Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-6707 TEST org.apache.hadoop.hbase.backup.example.TestZooKeeperTableArchiveClient.testMultipleTables flaps; ADDENDUM v4 

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1403098 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael Stack 2012-10-28 21:49:19 +00:00
parent 056977d70b
commit 28fffb91b7
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hbase-server/src/main/java/org/apache/hadoop/hbase/backup/example/LongTermArchivingHFileCleaner.java
View File

@ -50,16 +50,14 @@ public class LongTermArchivingHFileCleaner extends BaseHFileCleanerDelegate {
@Override @Override
public boolean isFileDeletable(Path file) { public boolean isFileDeletable(Path file) {
try { try {
// if its a directory, then it can be deleted
if (!fs.isFile(file)) return true;
// check to see if
FileStatus[] deleteStatus = FSUtils.listStatus(this.fs, file, null); FileStatus[] deleteStatus = FSUtils.listStatus(this.fs, file, null);
// if the file doesn't exist, then it can be deleted (but should never // if the file doesn't exist, then it can be deleted (but should never
// happen since deleted files shouldn't get passed in) // happen since deleted files shouldn't get passed in)
if (deleteStatus == null) return true; if (deleteStatus == null) return true;
// if its a directory with stuff in it, don't delete
if (deleteStatus.length > 1) return false;
// if its an empty directory, we can definitely delete
if (deleteStatus[0].isDir()) return true;
// otherwise, we need to check the file's table and see its being archived // otherwise, we need to check the file's table and see its being archived
Path family = file.getParent(); Path family = file.getParent();
@ -67,7 +65,9 @@ public class LongTermArchivingHFileCleaner extends BaseHFileCleanerDelegate {
Path table = region.getParent(); Path table = region.getParent();
String tableName = table.getName(); String tableName = table.getName();
return !archiveTracker.keepHFiles(tableName); boolean ret = !archiveTracker.keepHFiles(tableName);
LOG.debug("Archiver says to [" + (ret ? "delete" : "keep") + "] files for table:" + tableName);
return ret;
} catch (IOException e) { } catch (IOException e) {
LOG.error("Failed to lookup status of:" + file + ", keeping it just incase.", e); LOG.error("Failed to lookup status of:" + file + ", keeping it just incase.", e);
return false; return false;