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 1E80B10DD9 for ; Thu, 5 Sep 2013 15:23:18 +0000 (UTC) Received: (qmail 13999 invoked by uid 500); 5 Sep 2013 15:23:18 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 13928 invoked by uid 500); 5 Sep 2013 15:23:14 -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 13919 invoked by uid 99); 5 Sep 2013 15:23:13 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 05 Sep 2013 15:23:13 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id C149B9014A9; Thu, 5 Sep 2013 15:23:12 +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 Message-Id: <67945d9051574c0a8dfc543b97bbea7e@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: ACCUMULO-1685 properly parse logSet data for confirming deletes Date: Thu, 5 Sep 2013 15:23:12 +0000 (UTC) Updated Branches: refs/heads/master 53a29837d -> ff02d20db ACCUMULO-1685 properly parse logSet data for confirming deletes Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/ff02d20d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ff02d20d Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/ff02d20d Branch: refs/heads/master Commit: ff02d20db00dfa00929365e1b7befc5ebb91f76f Parents: 53a2983 Author: Eric Newton Authored: Thu Sep 5 11:23:24 2013 -0400 Committer: Eric Newton Committed: Thu Sep 5 11:23:24 2013 -0400 ---------------------------------------------------------------------- .../apache/accumulo/server/gc/GarbageCollectWriteAheadLogs.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/ff02d20d/server/src/main/java/org/apache/accumulo/server/gc/GarbageCollectWriteAheadLogs.java ---------------------------------------------------------------------- diff --git a/server/src/main/java/org/apache/accumulo/server/gc/GarbageCollectWriteAheadLogs.java b/server/src/main/java/org/apache/accumulo/server/gc/GarbageCollectWriteAheadLogs.java index 7dba265..2ce40b5 100644 --- a/server/src/main/java/org/apache/accumulo/server/gc/GarbageCollectWriteAheadLogs.java +++ b/server/src/main/java/org/apache/accumulo/server/gc/GarbageCollectWriteAheadLogs.java @@ -226,7 +226,9 @@ public class GarbageCollectWriteAheadLogs { int count = 0; Iterator iterator = MetadataTableUtil.getLogEntries(SystemCredentials.get()); while (iterator.hasNext()) { - for (String filename : iterator.next().logSet) { + for (String entry : iterator.next().logSet) { + String parts[] = entry.split("/", 2); + String filename = parts[1]; Path path; if (filename.contains(":")) path = new Path(filename);