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 6A6E21038B for ; Mon, 9 Sep 2013 16:08:01 +0000 (UTC) Received: (qmail 67471 invoked by uid 500); 9 Sep 2013 16:08:01 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 67366 invoked by uid 500); 9 Sep 2013 16:07:56 -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 67271 invoked by uid 99); 9 Sep 2013 16:07:55 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 09 Sep 2013 16:07:55 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 3A86A903F26; Mon, 9 Sep 2013 16:07:55 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: vines@apache.org To: commits@accumulo.apache.org Date: Mon, 09 Sep 2013 16:07:55 -0000 Message-Id: <6e2483658f33460ab0330776cac74842@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/2] git commit: ACCUMULO-1618 - adding trash variable checks to dispersed WAL cleanup code Updated Branches: refs/heads/master a028e763b -> 2a2f42464 ACCUMULO-1618 - adding trash variable checks to dispersed WAL cleanup code Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/368fe1c4 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/368fe1c4 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/368fe1c4 Branch: refs/heads/master Commit: 368fe1c447bf17e91baf7ced2049c9ac611f1b96 Parents: f1af6f9 Author: John Vines Authored: Mon Sep 9 11:44:57 2013 -0400 Committer: John Vines Committed: Mon Sep 9 11:44:57 2013 -0400 ---------------------------------------------------------------------- .../main/java/org/apache/accumulo/server/tabletserver/Tablet.java | 2 +- .../java/org/apache/accumulo/server/tabletserver/TabletServer.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/368fe1c4/server/src/main/java/org/apache/accumulo/server/tabletserver/Tablet.java ---------------------------------------------------------------------- diff --git a/server/src/main/java/org/apache/accumulo/server/tabletserver/Tablet.java b/server/src/main/java/org/apache/accumulo/server/tabletserver/Tablet.java index 7223738..6162105 100644 --- a/server/src/main/java/org/apache/accumulo/server/tabletserver/Tablet.java +++ b/server/src/main/java/org/apache/accumulo/server/tabletserver/Tablet.java @@ -1042,7 +1042,7 @@ public class Tablet { Trash trash = new Trash(fs, fs.getConf()); for (Path path : oldDatafiles) { Path deleteFile = new Path(location + "/delete+" + compactName + "+" + path.getName()); - if (!trash.moveToTrash(deleteFile)) + if (acuTableConf.getBoolean(Property.GC_TRASH_IGNORE) || !trash.moveToTrash(deleteFile)) fs.delete(deleteFile, true); } } http://git-wip-us.apache.org/repos/asf/accumulo/blob/368fe1c4/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java ---------------------------------------------------------------------- diff --git a/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java b/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java index 07d8828..3c936f9 100644 --- a/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java +++ b/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java @@ -2095,7 +2095,7 @@ public class TabletServer extends AbstractMetricsImpl implements org.apache.accu log.info("Deleting walog " + filename); Trash trash = new Trash(fs, fs.getConf()); Path sourcePath = new Path(source); - if (!trash.moveToTrash(sourcePath) && !fs.delete(sourcePath, true)) + if (!(!acuConf.getBoolean(Property.GC_TRASH_IGNORE) && trash.moveToTrash(sourcePath)) && !fs.delete(sourcePath, true)) log.warn("Failed to delete walog " + source); Path recoveryPath = new Path(Constants.getRecoveryDir(acuConf), filename); try {