Return-Path: X-Original-To: apmail-accumulo-commits-archive@www.apache.org Delivered-To: apmail-accumulo-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id D4EF1119D0 for ; Tue, 22 Jul 2014 21:26:44 +0000 (UTC) Received: (qmail 41298 invoked by uid 500); 22 Jul 2014 21:26:44 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 41214 invoked by uid 500); 22 Jul 2014 21:26:44 -0000 Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@accumulo.apache.org Delivered-To: mailing list commits@accumulo.apache.org Received: (qmail 40992 invoked by uid 99); 22 Jul 2014 21:26:44 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 22 Jul 2014 21:26:44 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 4FDDB9B0300; Tue, 22 Jul 2014 21:26:44 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ecn@apache.org To: commits@accumulo.apache.org Date: Tue, 22 Jul 2014 21:26:54 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [11/11] git commit: ACCUMULO-3010 do not perform a merge when saving memory during a tablet load 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 Authored: Tue Jul 22 17:22:16 2014 -0400 Committer: Eric C. Newton 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(); - 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();