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 EF8A619161 for ; Tue, 5 Apr 2016 15:23:16 +0000 (UTC) Received: (qmail 71591 invoked by uid 500); 5 Apr 2016 15:23:16 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 71547 invoked by uid 500); 5 Apr 2016 15:23:16 -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 71538 invoked by uid 99); 5 Apr 2016 15:23:16 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 05 Apr 2016 15:23:16 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id AC82CE01E2; Tue, 5 Apr 2016 15:23:16 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: elserj@apache.org To: commits@accumulo.apache.org Date: Tue, 05 Apr 2016 15:23:16 -0000 Message-Id: <40cda01181a94b15bec2c0edbfdf5ced@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/6] accumulo git commit: ACCUMULO-4178: Updated the sender thread to include the table ids in thread name. Repository: accumulo Updated Branches: refs/heads/1.6 2afc3dc87 -> 071247167 refs/heads/1.7 2e4f32095 -> f7a24d751 refs/heads/master 8839fe511 -> 52318429a ACCUMULO-4178: Updated the sender thread to include the table ids in thread name. Closes apache/accumulo#87 Signed-off-by: Josh Elser Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/07124716 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/07124716 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/07124716 Branch: refs/heads/1.6 Commit: 071247167613b490bf6b722f97299fb8aca3c3a6 Parents: 2afc3dc Author: Ivan Bella Authored: Sun Apr 3 00:49:55 2016 -0400 Committer: Josh Elser Committed: Tue Apr 5 11:19:07 2016 -0400 ---------------------------------------------------------------------- .../core/client/impl/TabletServerBatchWriter.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/07124716/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 491bcc1..35d1e49 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 @@ -31,6 +31,7 @@ import java.util.Map.Entry; import java.util.Set; import java.util.Timer; import java.util.TimerTask; +import java.util.TreeSet; import java.util.concurrent.ExecutorService; import java.util.concurrent.SynchronousQueue; import java.util.concurrent.ThreadPoolExecutor; @@ -38,6 +39,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicLong; +import com.google.common.base.Joiner; import org.apache.accumulo.core.client.AccumuloException; import org.apache.accumulo.core.client.AccumuloSecurityException; import org.apache.accumulo.core.client.BatchWriterConfig; @@ -831,10 +833,15 @@ public class TabletServerBatchWriter { try { long count = 0; - for (List list : mutationBatch.values()) { - count += list.size(); + + Set tableIds = new TreeSet(); + for (Map.Entry> entry : mutationBatch.entrySet()) { + count += entry.getValue().size(); + tableIds.add(entry.getKey().getTableId()); } - String msg = "sending " + String.format("%,d", count) + " mutations to " + String.format("%,d", mutationBatch.size()) + " tablets at " + location; + + String msg = "sending " + String.format("%,d", count) + " mutations to " + String.format("%,d", mutationBatch.size()) + " tablets at " + location + + " tids: [" + Joiner.on(',').join(tableIds) + ']'; Thread.currentThread().setName(msg); Span span = Trace.start("sendMutations");