Repository: cassandra Updated Branches: refs/heads/cassandra-3.1 af089f6ff -> c1b1aec19
Add the missing Native-Transport-Requests in tpstats back Patch by Wei Deng; reviewed by tjake for CASSANDRA-10044 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5cafe860 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5cafe860 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5cafe860 Branch: refs/heads/cassandra-3.1 Commit: 5cafe8606fa1f28b535c69c57f78593c4e6ea85a Parents: f5a09c1 Author: Wei Deng <weid...@gmail.com> Authored: Mon Aug 10 22:57:49 2015 -0600 Committer: T Jake Luciani <j...@apache.org> Committed: Wed Nov 25 09:19:21 2015 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/tools/NodeProbe.java | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5cafe860/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 91f4577..6f69f03 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 2.1.12 + * Add Native-Transport-Requests back to tpstats (CASSANDRA-10044) * Make paging logic consistent between searcher impls (CASSANDRA-10683) * Fix CompressedInputStream for proper cleanup (CASSANDRA-10012) * (cqlsh) Support counters in COPY commands (CASSANDRA-9043) http://git-wip-us.apache.org/repos/asf/cassandra/blob/5cafe860/src/java/org/apache/cassandra/tools/NodeProbe.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/NodeProbe.java b/src/java/org/apache/cassandra/tools/NodeProbe.java index 49c493d..5ba5a32 100644 --- a/src/java/org/apache/cassandra/tools/NodeProbe.java +++ b/src/java/org/apache/cassandra/tools/NodeProbe.java @@ -1380,7 +1380,8 @@ class ThreadPoolProxyMBeanIterator implements Iterator<Map.Entry<String, JMXEnab { Set<ObjectName> requests = mbeanServerConn.queryNames(new ObjectName("org.apache.cassandra.request:type=*"), null); Set<ObjectName> internal = mbeanServerConn.queryNames(new ObjectName("org.apache.cassandra.internal:type=*"), null); - resIter = Iterables.concat(requests, internal).iterator(); + Set<ObjectName> transport = mbeanServerConn.queryNames(new ObjectName("org.apache.cassandra.transport:type=*"), null); + resIter = Iterables.concat(requests, internal, transport).iterator(); this.mbeanServerConn = mbeanServerConn; }