accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e..@apache.org
Subject [4/5] git commit: Merge branch '1.5.1-SNAPSHOT'
Date Fri, 13 Sep 2013 16:26:20 GMT
Merge branch '1.5.1-SNAPSHOT'


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/886e56a3
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/886e56a3
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/886e56a3

Branch: refs/heads/master
Commit: 886e56a3aedac70f453d75d3d641455bb8936a35
Parents: 46b4965 4f2516e
Author: Eric Newton <eric.newton@gmail.com>
Authored: Fri Sep 13 11:44:35 2013 -0400
Committer: Eric Newton <eric.newton@gmail.com>
Committed: Fri Sep 13 11:44:35 2013 -0400

----------------------------------------------------------------------
 .../accumulo/server/tabletserver/Tablet.java      | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/886e56a3/server/src/main/java/org/apache/accumulo/server/tabletserver/Tablet.java
----------------------------------------------------------------------
diff --cc server/src/main/java/org/apache/accumulo/server/tabletserver/Tablet.java
index 5fd9453,4439e74..d33b26c
--- a/server/src/main/java/org/apache/accumulo/server/tabletserver/Tablet.java
+++ b/server/src/main/java/org/apache/accumulo/server/tabletserver/Tablet.java
@@@ -1427,8 -1480,20 +1421,20 @@@ public class Tablet 
      
      computeNumEntries();
      
 -    datafileManager.removeFilesAfterScanRel(scanFiles);
 +    datafileManager.removeFilesAfterScan(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();
+     }
+ 
+     // 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 ");
    }
    


Mime
View raw message