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 5874C10113 for ; Mon, 16 Sep 2013 22:13:12 +0000 (UTC) Received: (qmail 25476 invoked by uid 500); 16 Sep 2013 22:13:12 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 25414 invoked by uid 500); 16 Sep 2013 22:13:06 -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 25406 invoked by uid 99); 16 Sep 2013 22:13:05 -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, 16 Sep 2013 22:13:05 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 4635390625C; Mon, 16 Sep 2013 22:13:05 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: kturner@apache.org To: commits@accumulo.apache.org Message-Id: <47c54516fabb40899ea28fb659a3872a@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: ACCUMULO-1345 added filename to log message about stuck compactions Date: Mon, 16 Sep 2013 22:13:05 +0000 (UTC) Updated Branches: refs/heads/master f95fca397 -> 2ab30557c ACCUMULO-1345 added filename to log message about stuck compactions Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/2ab30557 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/2ab30557 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/2ab30557 Branch: refs/heads/master Commit: 2ab30557c434c52c75203603e713f9cd7aa4d454 Parents: f95fca3 Author: Keith Turner Authored: Mon Sep 16 18:12:59 2013 -0400 Committer: Keith Turner Committed: Mon Sep 16 18:12:59 2013 -0400 ---------------------------------------------------------------------- .../apache/accumulo/server/tabletserver/CompactionWatcher.java | 3 ++- .../java/org/apache/accumulo/server/tabletserver/Compactor.java | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/2ab30557/server/src/main/java/org/apache/accumulo/server/tabletserver/CompactionWatcher.java ---------------------------------------------------------------------- diff --git a/server/src/main/java/org/apache/accumulo/server/tabletserver/CompactionWatcher.java b/server/src/main/java/org/apache/accumulo/server/tabletserver/CompactionWatcher.java index 44b26ca..2ef2c24 100644 --- a/server/src/main/java/org/apache/accumulo/server/tabletserver/CompactionWatcher.java +++ b/server/src/main/java/org/apache/accumulo/server/tabletserver/CompactionWatcher.java @@ -92,7 +92,8 @@ public class CompactionWatcher implements Runnable { Exception e = new Exception("Possible stack trace of compaction stuck on " + oci.compactionInfo.getExtent()); e.setStackTrace(trace); Logger.getLogger(CompactionWatcher.class).warn( - "Compaction of " + oci.compactionInfo.getExtent() + " has not made progress for at least " + (time - oci.firstSeen) + "ms", e); + "Compaction of " + oci.compactionInfo.getExtent() + " to " + oci.compactionInfo.getOutputFile() + " has not made progress for at least " + + (time - oci.firstSeen) + "ms", e); oci.loggedWarning = true; } } http://git-wip-us.apache.org/repos/asf/accumulo/blob/2ab30557/server/src/main/java/org/apache/accumulo/server/tabletserver/Compactor.java ---------------------------------------------------------------------- diff --git a/server/src/main/java/org/apache/accumulo/server/tabletserver/Compactor.java b/server/src/main/java/org/apache/accumulo/server/tabletserver/Compactor.java index 8001cad..875a332 100644 --- a/server/src/main/java/org/apache/accumulo/server/tabletserver/Compactor.java +++ b/server/src/main/java/org/apache/accumulo/server/tabletserver/Compactor.java @@ -208,6 +208,10 @@ public class Compactor implements Callable { return compactor.thread; } + public String getOutputFile() { + return compactor.getOutputFile(); + } + public ActiveCompaction toThrift() { CompactionType type;