Updated Branches: refs/heads/1.5.1-SNAPSHOT c42a511a7 -> 75f27e5d1
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.5.1-SNAPSHOT Commit: 99c4361aea0878fbbce1b855492fa67f630f0c60 Parents: 0ffb01a Author: Eric Newton <eric.new...@gmail.com> Authored: Fri Jan 17 10:20:14 2014 -0500 Committer: Eric Newton <eric.new...@gmail.com> 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(); }
