Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id F39322009F9 for ; Mon, 23 May 2016 17:01:25 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id F27A7160A30; Mon, 23 May 2016 15:01:25 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 4E755160A05 for ; Mon, 23 May 2016 17:01:25 +0200 (CEST) Received: (qmail 60191 invoked by uid 500); 23 May 2016 15:01:24 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 60164 invoked by uid 99); 23 May 2016 15:01:24 -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; Mon, 23 May 2016 15:01:24 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 15150DFB14; Mon, 23 May 2016 15:01:24 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: yukim@apache.org To: commits@cassandra.apache.org Date: Mon, 23 May 2016 15:01:24 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [01/15] cassandra git commit: Add message dropped tasks to nodetool netstats archived-at: Mon, 23 May 2016 15:01:26 -0000 Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 00f25401c -> 129b1193e refs/heads/cassandra-2.2 2837ec65b -> e0c6a9eca refs/heads/cassandra-3.0 6663c5ff8 -> 4cdce5645 refs/heads/cassandra-3.7 f294750f5 -> bdb942173 refs/heads/trunk 74f41c9cc -> 400ad9468 Add message dropped tasks to nodetool netstats patch by Jeremiah Jordan; reviewed by yukim for CASSANDRA-11855 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/129b1193 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/129b1193 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/129b1193 Branch: refs/heads/cassandra-2.1 Commit: 129b1193e26c015fd06ed652eb62dcd509b6bc50 Parents: 00f2540 Author: Jeremiah D Jordan Authored: Fri May 20 11:44:44 2016 -0500 Committer: Yuki Morishita Committed: Mon May 23 09:27:13 2016 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/tools/NodeTool.java | 11 ++++++++--- 2 files changed, 9 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/129b1193/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 3972248..7a0ccba 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 2.1.15 + * Add message dropped tasks to nodetool netstats (CASSANDRA-11855) * Don't compute expensive MaxPurgeableTimestamp until we've verified there's an expired tombstone (CASSANDRA-11834) * Fix paging on DISTINCT queries repeats result when first row in partition changes http://git-wip-us.apache.org/repos/asf/cassandra/blob/129b1193/src/java/org/apache/cassandra/tools/NodeTool.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/NodeTool.java b/src/java/org/apache/cassandra/tools/NodeTool.java index 1de2e20..5af8240 100644 --- a/src/java/org/apache/cassandra/tools/NodeTool.java +++ b/src/java/org/apache/cassandra/tools/NodeTool.java @@ -708,10 +708,12 @@ public class NodeTool System.out.printf("%-25s", "Pool Name"); System.out.printf("%10s", "Active"); System.out.printf("%10s", "Pending"); - System.out.printf("%15s%n", "Completed"); + System.out.printf("%15s", "Completed"); + System.out.printf("%10s%n", "Dropped"); int pending; long completed; + long dropped; pending = 0; for (int n : ms.getCommandPendingTasks().values()) @@ -719,7 +721,10 @@ public class NodeTool completed = 0; for (long n : ms.getCommandCompletedTasks().values()) completed += n; - System.out.printf("%-25s%10s%10s%15s%n", "Commands", "n/a", pending, completed); + dropped = 0; + for (long n : ms.getCommandDroppedTasks().values()) + dropped += n; + System.out.printf("%-25s%10s%10s%15s%10s%n", "Commands", "n/a", pending, completed, dropped); pending = 0; for (int n : ms.getResponsePendingTasks().values()) @@ -727,7 +732,7 @@ public class NodeTool completed = 0; for (long n : ms.getResponseCompletedTasks().values()) completed += n; - System.out.printf("%-25s%10s%10s%15s%n", "Responses", "n/a", pending, completed); + System.out.printf("%-25s%10s%10s%15s%10s%n", "Responses", "n/a", pending, completed, "n/a"); } } }