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 B56261078B for ; Fri, 17 Jan 2014 15:24:18 +0000 (UTC) Received: (qmail 35230 invoked by uid 500); 17 Jan 2014 15:24:18 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 35157 invoked by uid 500); 17 Jan 2014 15:24:10 -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 35150 invoked by uid 99); 17 Jan 2014 15:24:09 -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, 17 Jan 2014 15:24:09 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 054841B462; Fri, 17 Jan 2014 15:24:09 +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: X-Mailer: ASF-Git Admin Mailer Subject: git commit: ACCUMULO-2209 reset the batch writer on any exception Date: Fri, 17 Jan 2014 15:24:09 +0000 (UTC) Updated Branches: refs/heads/1.4.5-SNAPSHOT 0ffb01a56 -> 99c4361ae ACCUMULO-2209 reset the batch writer on any exception Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/99c4361a Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/99c4361a Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/99c4361a Branch: refs/heads/1.4.5-SNAPSHOT Commit: 99c4361aea0878fbbce1b855492fa67f630f0c60 Parents: 0ffb01a Author: Eric Newton Authored: Fri Jan 17 10:20:14 2014 -0500 Committer: Eric Newton Committed: Fri Jan 17 10:20:24 2014 -0500 ---------------------------------------------------------------------- .../main/java/org/apache/accumulo/server/trace/TraceServer.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/99c4361a/src/server/src/main/java/org/apache/accumulo/server/trace/TraceServer.java ---------------------------------------------------------------------- diff --git a/src/server/src/main/java/org/apache/accumulo/server/trace/TraceServer.java b/src/server/src/main/java/org/apache/accumulo/server/trace/TraceServer.java index 8e61a89..4d89e9c 100644 --- a/src/server/src/main/java/org/apache/accumulo/server/trace/TraceServer.java +++ b/src/server/src/main/java/org/apache/accumulo/server/trace/TraceServer.java @@ -27,7 +27,6 @@ import org.apache.accumulo.cloudtrace.thrift.SpanReceiver; import org.apache.accumulo.core.Constants; import org.apache.accumulo.core.client.BatchWriter; import org.apache.accumulo.core.client.Connector; -import org.apache.accumulo.core.client.MutationsRejectedException; import org.apache.accumulo.core.conf.AccumuloConfiguration; import org.apache.accumulo.core.conf.Property; import org.apache.accumulo.core.data.Mutation; @@ -189,7 +188,7 @@ public class TraceServer implements Watcher { private void flush() { try { writer.flush(); - } catch (MutationsRejectedException e) { + } catch (Exception e) { log.error("Error flushing traces", e); resetWriter(); }