Return-Path: X-Original-To: apmail-cassandra-commits-archive@www.apache.org Delivered-To: apmail-cassandra-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 177A1D3E8 for ; Mon, 11 Mar 2013 14:22:52 +0000 (UTC) Received: (qmail 69798 invoked by uid 500); 11 Mar 2013 14:21:25 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 69438 invoked by uid 500); 11 Mar 2013 14:21:22 -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 60906 invoked by uid 99); 11 Mar 2013 14:17:30 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 11 Mar 2013 14:17:30 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 176CD5EE9; Mon, 11 Mar 2013 14:17:30 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: jbellis@apache.org To: commits@cassandra.apache.org X-Mailer: ASF-Git Admin Mailer Subject: =?utf-8?q?=5B4/5=5D_git_commit=3A_remove_more_ipv6_colons_from_met?= =?utf-8?q?ric_names_patch_by_Micha=C5=82_Michalski=3B_reviewed_by_jbellis_f?= =?utf-8?q?or_CASSANDRA-5328?= Message-Id: <20130311141730.176CD5EE9@tyr.zones.apache.org> Date: Mon, 11 Mar 2013 14:17:30 +0000 (UTC) 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 Authored: Mon Mar 11 09:17:17 2013 -0500 Committer: Jonathan Ellis 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(":", "."))); } }