accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e..@apache.org
Subject [11/11] git commit: ACCUMULO-3010 do not perform a merge when saving memory during a tablet load
Date Tue, 22 Jul 2014 21:26:54 GMT
ACCUMULO-3010 do not perform a merge when saving memory during a tablet load


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

Branch: refs/heads/master
Commit: 2b06384c2ea3dc79eb0f3db0a4d12466cb63a3cb
Parents: 5f9309e
Author: Eric C. Newton <eric.newton@gmail.com>
Authored: Tue Jul 22 17:22:16 2014 -0400
Committer: Eric C. Newton <eric.newton@gmail.com>
Committed: Tue Jul 22 17:22:16 2014 -0400

----------------------------------------------------------------------
 .../apache/accumulo/tserver/MinorCompactionReason.java  |  2 +-
 .../java/org/apache/accumulo/tserver/tablet/Tablet.java | 12 ++++--------
 2 files changed, 5 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/2b06384c/server/tserver/src/main/java/org/apache/accumulo/tserver/MinorCompactionReason.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/MinorCompactionReason.java
b/server/tserver/src/main/java/org/apache/accumulo/tserver/MinorCompactionReason.java
index 25cfd9b..82c791c 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/MinorCompactionReason.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/MinorCompactionReason.java
@@ -17,5 +17,5 @@
 package org.apache.accumulo.tserver;
 
 public enum MinorCompactionReason {
-  USER, SYSTEM, CLOSE
+  USER, SYSTEM, CLOSE, RECOVERY
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/accumulo/blob/2b06384c/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java
index ea694e0..6def254 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java
@@ -972,7 +972,10 @@ public class Tablet implements TabletCommitter {
     otherLogs = currentLogs;
     currentLogs = new HashSet<DfsLogger>();
 
-    FileRef mergeFile = getDatafileManager().reserveMergingMinorCompactionFile();
+    FileRef mergeFile = null;
+    if (mincReason != MinorCompactionReason.RECOVERY) {
+      mergeFile = getDatafileManager().reserveMergingMinorCompactionFile();
+    }
 
     return new MinorCompactionTask(this, mergeFile, oldCommitSession, flushId, mincReason);
 
@@ -1089,13 +1092,6 @@ public class Tablet implements TabletCommitter {
 
           return null;
         }
-        // We're still recovering log entries
-        if (getDatafileManager() == null) {
-          logMessage = new StringBuilder();
-          logMessage.append(extent.toString());
-          logMessage.append(" datafileManager " + getDatafileManager());
-          return null;
-        }
 
         mct = prepareForMinC(flushId, mincReason);
         t2 = System.currentTimeMillis();


Mime
View raw message