Updated Branches: refs/heads/master 46b49658b -> eb5e5a489
ACCUMULO-1452 remove tmp files after needsMajorCompation is callable Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/8f35d25c Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/8f35d25c Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/8f35d25c Branch: refs/heads/master Commit: 8f35d25c6daa7026a34cc322f30d740a7de8c0c2 Parents: 3a414da Author: Eric Newton <eric.new...@gmail.com> Authored: Fri Sep 13 11:43:17 2013 -0400 Committer: Eric Newton <eric.new...@gmail.com> Committed: Fri Sep 13 11:43:17 2013 -0400 ---------------------------------------------------------------------- .../org/apache/accumulo/server/tabletserver/Tablet.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/8f35d25c/src/server/src/main/java/org/apache/accumulo/server/tabletserver/Tablet.java ---------------------------------------------------------------------- diff --git a/src/server/src/main/java/org/apache/accumulo/server/tabletserver/Tablet.java b/src/server/src/main/java/org/apache/accumulo/server/tabletserver/Tablet.java index 9c26568..8da2297 100644 --- a/src/server/src/main/java/org/apache/accumulo/server/tabletserver/Tablet.java +++ b/src/server/src/main/java/org/apache/accumulo/server/tabletserver/Tablet.java @@ -1481,12 +1481,6 @@ public class Tablet { + " entries created)"); } - // look for hints of a failure on the previous tablet server - if (!logEntries.isEmpty() || needsMajorCompaction(MajorCompactionReason.NORMAL)) { - // look for any temp files hanging around - removeOldTemporaryFiles(); - } - // do this last after tablet is completely setup because it // could cause major compaction to start datafileManager = new DatafileManager(datafiles); @@ -1495,6 +1489,12 @@ public class Tablet { datafileManager.removeFilesAfterScanRel(scanFiles); + // look for hints of a failure on the previous tablet server + if (!logEntries.isEmpty() || needsMajorCompaction(MajorCompactionReason.NORMAL)) { + // look for any temp files hanging around + removeOldTemporaryFiles(); + } + log.log(TLevel.TABLET_HIST, extent + " opened "); }
