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 042BBC455 for ; Fri, 5 Dec 2014 22:56:48 +0000 (UTC) Received: (qmail 44656 invoked by uid 500); 5 Dec 2014 22:56:47 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 44614 invoked by uid 500); 5 Dec 2014 22:56:47 -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 44592 invoked by uid 99); 5 Dec 2014 22:56:47 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 05 Dec 2014 22:56:47 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 98CDD9533DE; Fri, 5 Dec 2014 22:56:47 +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: Fri, 05 Dec 2014 22:56:48 -0000 Message-Id: <5034481a9c73472d951f3864acef6727@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/4] accumulo git commit: Inject a little jmx grouping into the names to be a nicer output. Inject a little jmx grouping into the names to be a nicer output. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/ac361d29 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ac361d29 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/ac361d29 Branch: refs/heads/metrics2-backwardscompat Commit: ac361d2938b8a3af4eaefc4fb08f98f48cf2c117 Parents: 20655d7 Author: Josh Elser Authored: Fri Dec 5 13:33:19 2014 -0500 Committer: Josh Elser Committed: Fri Dec 5 13:33:19 2014 -0500 ---------------------------------------------------------------------- .../org/apache/accumulo/server/metrics/Metrics2ThriftMetrics.java | 2 +- .../apache/accumulo/master/metrics/Metrics2ReplicationMetrics.java | 2 +- .../accumulo/tserver/metrics/Metrics2TabletServerMetrics.java | 2 +- .../accumulo/tserver/metrics/Metrics2TabletServerMinCMetrics.java | 2 +- .../accumulo/tserver/metrics/Metrics2TabletServerScanMetrics.java | 2 +- .../tserver/metrics/Metrics2TabletServerUpdateMetrics.java | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/ac361d29/server/base/src/main/java/org/apache/accumulo/server/metrics/Metrics2ThriftMetrics.java ---------------------------------------------------------------------- diff --git a/server/base/src/main/java/org/apache/accumulo/server/metrics/Metrics2ThriftMetrics.java b/server/base/src/main/java/org/apache/accumulo/server/metrics/Metrics2ThriftMetrics.java index 028d1ae..300e1a3 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/metrics/Metrics2ThriftMetrics.java +++ b/server/base/src/main/java/org/apache/accumulo/server/metrics/Metrics2ThriftMetrics.java @@ -36,7 +36,7 @@ public class Metrics2ThriftMetrics implements Metrics, MetricsSource, ThriftMetr Metrics2ThriftMetrics(MetricsSystem system, String serverName, String threadName) { this.system = system; this.context = serverName; - this.name = "ThriftMetrics" + serverName; + this.name = RECORD_NAME + ",sub=" + serverName; this.desc = "Thrift Server Metrics - " + serverName + " " + threadName; this.registry = new MetricsRegistry(Interns.info(name, desc)); } http://git-wip-us.apache.org/repos/asf/accumulo/blob/ac361d29/server/master/src/main/java/org/apache/accumulo/master/metrics/Metrics2ReplicationMetrics.java ---------------------------------------------------------------------- diff --git a/server/master/src/main/java/org/apache/accumulo/master/metrics/Metrics2ReplicationMetrics.java b/server/master/src/main/java/org/apache/accumulo/master/metrics/Metrics2ReplicationMetrics.java index d9269a9..c62d7ac 100644 --- a/server/master/src/main/java/org/apache/accumulo/master/metrics/Metrics2ReplicationMetrics.java +++ b/server/master/src/main/java/org/apache/accumulo/master/metrics/Metrics2ReplicationMetrics.java @@ -37,7 +37,7 @@ import org.apache.hadoop.metrics2.lib.MetricsRegistry; * */ public class Metrics2ReplicationMetrics implements Metrics, MetricsSource { - public static final String NAME = "ReplicationMetrics", DESCRIPTION = "Data-Center Replication Metrics"; + public static final String NAME = MASTER_RECORD + ",sub=Replication", DESCRIPTION = "Data-Center Replication Metrics"; public static final String PENDING_FILES = "filesPendingReplication", NUM_PEERS = "numPeers", MAX_REPLICATION_THREADS = "maxReplicationThreads"; private final Master master; http://git-wip-us.apache.org/repos/asf/accumulo/blob/ac361d29/server/tserver/src/main/java/org/apache/accumulo/tserver/metrics/Metrics2TabletServerMetrics.java ---------------------------------------------------------------------- diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/metrics/Metrics2TabletServerMetrics.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/metrics/Metrics2TabletServerMetrics.java index 7aacf1f..8095a6b 100644 --- a/server/tserver/src/main/java/org/apache/accumulo/tserver/metrics/Metrics2TabletServerMetrics.java +++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/metrics/Metrics2TabletServerMetrics.java @@ -30,7 +30,7 @@ import org.apache.hadoop.metrics2.lib.MutableGaugeLong; * */ public class Metrics2TabletServerMetrics implements Metrics, MetricsSource, TabletServerMetricsKeys { - public static final String NAME = "GeneralMetrics", DESCRIPTION = "General TabletServer Metrics", CONTEXT = "general"; + public static final String NAME = TSERVER_RECORD + ",sub=General", DESCRIPTION = "General TabletServer Metrics", CONTEXT = "general"; private final TabletServerMetricsUtil util; private final MetricsSystem system; http://git-wip-us.apache.org/repos/asf/accumulo/blob/ac361d29/server/tserver/src/main/java/org/apache/accumulo/tserver/metrics/Metrics2TabletServerMinCMetrics.java ---------------------------------------------------------------------- diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/metrics/Metrics2TabletServerMinCMetrics.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/metrics/Metrics2TabletServerMinCMetrics.java index a8d5933..ff3ee57 100644 --- a/server/tserver/src/main/java/org/apache/accumulo/tserver/metrics/Metrics2TabletServerMinCMetrics.java +++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/metrics/Metrics2TabletServerMinCMetrics.java @@ -29,7 +29,7 @@ import org.apache.hadoop.metrics2.lib.MutableStat; * */ public class Metrics2TabletServerMinCMetrics implements Metrics, MetricsSource, TabletServerMinCMetricsKeys { - public static final String NAME = "MinorCompactionMetrics", DESCRIPTION = "TabletServer Minor Compaction Metrics", CONTEXT = "minc"; + public static final String NAME = TSERVER_RECORD + ",sub=MinorCompactions", DESCRIPTION = "TabletServer Minor Compaction Metrics", CONTEXT = "minc"; private final MetricsSystem system; private final MetricsRegistry registry; http://git-wip-us.apache.org/repos/asf/accumulo/blob/ac361d29/server/tserver/src/main/java/org/apache/accumulo/tserver/metrics/Metrics2TabletServerScanMetrics.java ---------------------------------------------------------------------- diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/metrics/Metrics2TabletServerScanMetrics.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/metrics/Metrics2TabletServerScanMetrics.java index 245a2bf..fdc6925 100644 --- a/server/tserver/src/main/java/org/apache/accumulo/tserver/metrics/Metrics2TabletServerScanMetrics.java +++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/metrics/Metrics2TabletServerScanMetrics.java @@ -29,7 +29,7 @@ import org.apache.hadoop.metrics2.lib.MutableStat; * */ public class Metrics2TabletServerScanMetrics implements Metrics, MetricsSource, TabletServerScanMetricsKeys { - public static final String NAME = "ScanMetrics", DESCRIPTION = "TabletServer Scan Metrics", CONTEXT = "scan"; + public static final String NAME = TSERVER_RECORD + ",sub=Scans", DESCRIPTION = "TabletServer Scan Metrics", CONTEXT = "scan"; private final MetricsSystem system; private final MetricsRegistry registry; http://git-wip-us.apache.org/repos/asf/accumulo/blob/ac361d29/server/tserver/src/main/java/org/apache/accumulo/tserver/metrics/Metrics2TabletServerUpdateMetrics.java ---------------------------------------------------------------------- diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/metrics/Metrics2TabletServerUpdateMetrics.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/metrics/Metrics2TabletServerUpdateMetrics.java index 83670c0..d422c4a 100644 --- a/server/tserver/src/main/java/org/apache/accumulo/tserver/metrics/Metrics2TabletServerUpdateMetrics.java +++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/metrics/Metrics2TabletServerUpdateMetrics.java @@ -30,7 +30,7 @@ import org.apache.hadoop.metrics2.lib.MutableStat; * */ public class Metrics2TabletServerUpdateMetrics implements Metrics, MetricsSource, TabletServerUpdateMetricsKeys { - public static final String NAME = "UpdateMetrics", DESCRIPTION = "TabletServer Update Metrics", CONTEXT = "update"; + public static final String NAME = TSERVER_RECORD + ",sub=Updates", DESCRIPTION = "TabletServer Update Metrics", CONTEXT = "update"; private final MetricsSystem system; private final MetricsRegistry registry;