Repository: accumulo Updated Branches: refs/heads/1.6.1-SNAPSHOT fbd0fc6ba -> 444a889c1
ACCUMULO-3010 cherry-picked to 1.6 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/444a889c Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/444a889c Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/444a889c Branch: refs/heads/1.6.1-SNAPSHOT Commit: 444a889c12d2e918895af8300016e9a2ec3b81f9 Parents: fbd0fc6 Author: Eric C. Newton <eric.new...@gmail.com> Authored: Tue Aug 5 08:54:52 2014 -0400 Committer: Eric C. Newton <eric.new...@gmail.com> Committed: Tue Aug 5 08:54:52 2014 -0400 ---------------------------------------------------------------------- .../main/java/org/apache/accumulo/tserver/Tablet.java | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/444a889c/server/tserver/src/main/java/org/apache/accumulo/tserver/Tablet.java ---------------------------------------------------------------------- diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/Tablet.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/Tablet.java index 429adc9..f9fdacb 100644 --- a/server/tserver/src/main/java/org/apache/accumulo/tserver/Tablet.java +++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/Tablet.java @@ -172,7 +172,7 @@ import com.google.common.annotations.VisibleForTesting; public class Tablet { enum MinorCompactionReason { - USER, SYSTEM, CLOSE + USER, SYSTEM, CLOSE, RECOVERY } public class CommitSession { @@ -2170,7 +2170,10 @@ public class Tablet { otherLogs = currentLogs; currentLogs = new HashSet<DfsLogger>(); - FileRef mergeFile = datafileManager.reserveMergingMinorCompactionFile(); + FileRef mergeFile = null; + if (mincReason != MinorCompactionReason.RECOVERY) { + mergeFile = datafileManager.reserveMergingMinorCompactionFile(); + } return new MinorCompactionTask(mergeFile, oldCommitSession, flushId, mincReason); @@ -2288,13 +2291,6 @@ public class Tablet { return null; } - // We're still recovering log entries - if (datafileManager == null) { - logMessage = new StringBuilder(); - logMessage.append(extent.toString()); - logMessage.append(" datafileManager " + datafileManager); - return null; - } mct = prepareForMinC(flushId, mincReason); t2 = System.currentTimeMillis();
