You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by dl...@apache.org on 2016/02/26 21:14:47 UTC
accumulo git commit: ACCUMULO-1755: Updated based on comments from
review.
Repository: accumulo
Updated Branches:
refs/heads/ACCUMULO-1755 be3843c26 -> 06a5f2d13
ACCUMULO-1755: Updated based on comments from review.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/06a5f2d1
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/06a5f2d1
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/06a5f2d1
Branch: refs/heads/ACCUMULO-1755
Commit: 06a5f2d13823a656b9bc90a61c53cf3baa668ae8
Parents: be3843c
Author: Dave Marion <dl...@apache.org>
Authored: Fri Feb 26 15:13:56 2016 -0500
Committer: Dave Marion <dl...@apache.org>
Committed: Fri Feb 26 15:13:56 2016 -0500
----------------------------------------------------------------------
.../core/client/impl/TabletServerBatchWriter.java | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/06a5f2d1/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchWriter.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchWriter.java b/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchWriter.java
index b494d8f..e1242b6 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchWriter.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchWriter.java
@@ -32,6 +32,7 @@ import java.util.Set;
import java.util.Timer;
import java.util.TimerTask;
import java.util.concurrent.ExecutorService;
+import java.util.concurrent.RejectedExecutionException;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicLong;
@@ -222,7 +223,12 @@ public class TabletServerBatchWriter {
if (mutations.getMemoryUsed() == 0)
return;
lastProcessingStartTime = System.currentTimeMillis();
- writer.queueMutations(mutations);
+ try {
+ writer.queueMutations(mutations);
+ } catch (RejectedExecutionException e) {
+ log.warn("Mutations rejected from binning thread, retrying...");
+ failedMutations.add(mutations);
+ }
mutations = new MutationSet();
}
@@ -630,7 +636,7 @@ public class TabletServerBatchWriter {
private static final int MUTATION_BATCH_SIZE = 1 << 17;
private final ExecutorService sendThreadPool;
- private final ExecutorService queueThreadPool = new SimpleThreadPool(1, "QueueMutations");
+ private final ExecutorService queueThreadPool = new SimpleThreadPool(1, "QueueMutationsForBinning");
private final Map<String,TabletServerMutations<Mutation>> serversMutations;
private final Set<String> queued;
private final Map<String,TabletLocator> locators;