From ozone-commits-return-310-archive-asf-public=cust-asf.ponee.io@hadoop.apache.org Thu Dec 5 12:41:31 2019 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [207.244.88.153]) by mx-eu-01.ponee.io (Postfix) with SMTP id 279F3180668 for ; Thu, 5 Dec 2019 13:41:31 +0100 (CET) Received: (qmail 85473 invoked by uid 500); 5 Dec 2019 12:41:30 -0000 Mailing-List: contact ozone-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ozone-commits@hadoop.apache.org Delivered-To: mailing list ozone-commits@hadoop.apache.org Received: (qmail 85448 invoked by uid 99); 5 Dec 2019 12:41:30 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 05 Dec 2019 12:41:30 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 0640F8D80B; Thu, 5 Dec 2019 12:41:30 +0000 (UTC) Date: Thu, 05 Dec 2019 12:41:30 +0000 To: "ozone-commits@hadoop.apache.org" Subject: [hadoop-ozone] 01/02: HDDS-2667. Prometheus reports invalid metric type MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit From: elek@apache.org In-Reply-To: <157554968991.32663.17017036361426949281@gitbox.apache.org> References: <157554968991.32663.17017036361426949281@gitbox.apache.org> X-Git-Host: gitbox.apache.org X-Git-Repo: hadoop-ozone X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Rev: 8e1e2250ea57796767790fd5bc917ef741b9e278 X-Git-NotificationType: diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated Message-Id: <20191205124130.0640F8D80B@gitbox.apache.org> This is an automated email from the ASF dual-hosted git repository. elek pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/hadoop-ozone.git commit 8e1e2250ea57796767790fd5bc917ef741b9e278 Author: Doroszlai, Attila AuthorDate: Thu Dec 5 12:24:46 2019 +0100 HDDS-2667. Prometheus reports invalid metric type Closes #306 --- .../java/org/apache/hadoop/hdds/server/PrometheusMetricsSink.java | 5 +++-- .../org/apache/hadoop/hdds/server/TestPrometheusMetricsSink.java | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/server/PrometheusMetricsSink.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/server/PrometheusMetricsSink.java index f37d323..f5f51e7 100644 --- a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/server/PrometheusMetricsSink.java +++ b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/server/PrometheusMetricsSink.java @@ -110,10 +110,11 @@ public class PrometheusMetricsSink implements MetricsSink { public String prometheusName(String recordName, String metricName) { - //RocksDB metric names already have underscores as delimiters. + // RocksDB metric names already have underscores as delimiters, + // but record name is from DB file name and '.' (as in 'om.db') is invalid if (StringUtils.isNotEmpty(recordName) && recordName.startsWith(ROCKSDB_CONTEXT_PREFIX)) { - return recordName.toLowerCase() + "_" + metricName.toLowerCase(); + return normalizeName(recordName) + "_" + metricName.toLowerCase(); } String baseName = StringUtils.capitalize(recordName) diff --git a/hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/server/TestPrometheusMetricsSink.java b/hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/server/TestPrometheusMetricsSink.java index f2683b5..7617bc7 100644 --- a/hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/server/TestPrometheusMetricsSink.java +++ b/hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/server/TestPrometheusMetricsSink.java @@ -133,7 +133,7 @@ public class TestPrometheusMetricsSink { public void testNamingRocksDB() { //RocksDB metrics are handled differently. PrometheusMetricsSink sink = new PrometheusMetricsSink(); - Assert.assertEquals("rocksdb_om.db_num_open_connections", + Assert.assertEquals("rocksdb_om_db_num_open_connections", sink.prometheusName("Rocksdb_om.db", "num_open_connections")); } --------------------------------------------------------------------- To unsubscribe, e-mail: ozone-commits-unsubscribe@hadoop.apache.org For additional commands, e-mail: ozone-commits-help@hadoop.apache.org