remove more ipv6 colons from metric names patch by MichaÅ Michalski; reviewed by jbellis for CASSANDRA-5328
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6caddcd9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6caddcd9 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6caddcd9 Branch: refs/heads/cassandra-1.2 Commit: 6caddcd91c03bdf6f2829d8b868d1b264effeae6 Parents: 51d71a7 Author: Jonathan Ellis <jbel...@apache.org> Authored: Mon Mar 11 09:17:17 2013 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Mon Mar 11 09:17:17 2013 -0500 ---------------------------------------------------------------------- CHANGES.txt | 2 +- .../apache/cassandra/metrics/StreamingMetrics.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6caddcd9/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 9296c6a..1279da7 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,6 +1,6 @@ 1.2.3 * add check for sstable overlap within a level on startup (CASSANDRA-5327) - * replace ipv6 colons in jmx object names (CASSANDRA-5298) + * replace ipv6 colons in jmx object names (CASSANDRA-5298, 5328) * Avoid allocating SSTableBoundedScanner during repair when the range does not intersect the sstable (CASSANDRA-5249) * Don't lowercase property map keys (this breaks NTS) (CASSANDRA-5292) http://git-wip-us.apache.org/repos/asf/cassandra/blob/6caddcd9/src/java/org/apache/cassandra/metrics/StreamingMetrics.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/metrics/StreamingMetrics.java b/src/java/org/apache/cassandra/metrics/StreamingMetrics.java index 05aad31..96c79c9 100644 --- a/src/java/org/apache/cassandra/metrics/StreamingMetrics.java +++ b/src/java/org/apache/cassandra/metrics/StreamingMetrics.java @@ -54,7 +54,7 @@ public class StreamingMetrics public StreamingMetrics(final InetAddress peer) { - incomingBytes = Metrics.newCounter(new MetricName(GROUP_NAME, TYPE_NAME, "IncomingBytes", peer.getHostAddress())); - outgoingBytes= Metrics.newCounter(new MetricName(GROUP_NAME, TYPE_NAME, "OutgoingBytes", peer.getHostAddress())); + incomingBytes = Metrics.newCounter(new MetricName(GROUP_NAME, TYPE_NAME, "IncomingBytes", peer.getHostAddress().replaceAll(":", "."))); + outgoingBytes= Metrics.newCounter(new MetricName(GROUP_NAME, TYPE_NAME, "OutgoingBytes", peer.getHostAddress().replaceAll(":", "."))); } }
