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 7516C10ACB for ; Fri, 13 Sep 2013 16:26:19 +0000 (UTC) Received: (qmail 53199 invoked by uid 500); 13 Sep 2013 16:26:19 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 53122 invoked by uid 500); 13 Sep 2013 16:26:19 -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 52997 invoked by uid 99); 13 Sep 2013 16:26:18 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 13 Sep 2013 16:26:18 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 0BDA7822967; Fri, 13 Sep 2013 16:26:18 +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: Fri, 13 Sep 2013 16:26:20 -0000 Message-Id: <2bee562bbe3b44d584c4300a19a8323f@git.apache.org> In-Reply-To: <7eeb3baa396942b3a7eaf3fee37543d7@git.apache.org> References: <7eeb3baa396942b3a7eaf3fee37543d7@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [4/5] git commit: Merge branch '1.5.1-SNAPSHOT' 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 Authored: Fri Sep 13 11:44:35 2013 -0400 Committer: Eric Newton 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 "); }