From f197aca260eda9931271808bfda4fdc5502f4127 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elek=20M=C3=A1rton?= Date: Tue, 17 Mar 2020 11:41:03 +0100 Subject: [PATCH 1/5] fix ratis name mapping --- .../http/RatisNameRewriteSampleBuilder.java | 17 +++++++++++++---- .../hdds/server/http/TestRatisNameRewrite.java | 10 ++++++++++ pom.xml | 2 +- 3 files changed, 24 insertions(+), 5 deletions(-) diff --git a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/server/http/RatisNameRewriteSampleBuilder.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/server/http/RatisNameRewriteSampleBuilder.java index 7d02f214d7d..66476118876 100644 --- a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/server/http/RatisNameRewriteSampleBuilder.java +++ b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/server/http/RatisNameRewriteSampleBuilder.java @@ -27,12 +27,17 @@ import io.prometheus.client.dropwizard.samplebuilder.DefaultSampleBuilder; import org.apache.logging.log4j.util.Strings; import static org.apache.ratis.server.metrics.RatisMetrics.RATIS_APPLICATION_NAME_METRICS; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Collect Dropwizard metrics and rename ratis specific metrics. */ public class RatisNameRewriteSampleBuilder extends DefaultSampleBuilder { + private static final Logger LOG = + LoggerFactory.getLogger(RatisNameRewriteSampleBuilder.class); + private List followerPatterns = new ArrayList<>(); public RatisNameRewriteSampleBuilder() { @@ -41,8 +46,8 @@ public RatisNameRewriteSampleBuilder() { "grpc_log_appender_follower_(.*)_(latency|success|inconsistency)" + ".*")); followerPatterns - .add(Pattern.compile("follower_(.*)_lastHeartbeatElapsedTime")); - followerPatterns.add(Pattern.compile("(.*)_peerCommitIndex")); + .add(Pattern.compile("follower_([^_]*)_.*")); + followerPatterns.add(Pattern.compile("([^_]*)_peerCommitIndex")); } @@ -51,12 +56,16 @@ public Sample createSample(String dropwizardName, String nameSuffix, List additionalLabelNames, List additionalLabelValues, double value) { //this is a ratis metrics, where the second part is an instance id. - if (dropwizardName.startsWith(RATIS_APPLICATION_NAME_METRICS) - || (dropwizardName.startsWith("ratis_grpc"))) { + if (dropwizardName.startsWith(RATIS_APPLICATION_NAME_METRICS)) { List names = new ArrayList<>(additionalLabelNames); List values = new ArrayList<>(additionalLabelValues); String name = normalizeRatisMetric(dropwizardName, names, values); + // if (LOG.isTraceEnabled()) { + LOG.info( + "Ratis dropwizard {} metrics are converted to {} with tag " + + "keys/values {},{}", dropwizardName, name, names, values); + // } return super .createSample(name, nameSuffix, names, diff --git a/hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/server/http/TestRatisNameRewrite.java b/hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/server/http/TestRatisNameRewrite.java index 2f24dcae6ff..f0067fd569a 100644 --- a/hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/server/http/TestRatisNameRewrite.java +++ b/hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/server/http/TestRatisNameRewrite.java @@ -44,6 +44,16 @@ public class TestRatisNameRewrite { @Parameterized.Parameters public static List parameters() { return Arrays.asList( + new Object[] { + "ratis.log_appender" + + ".851cb00a-af97-455a-b079-d94a77d2a936@group-C14654DE8C2C" + + ".follower_65f881ea-8794-403d-be77-a030ed79c341_match_index", + "ratis.log_appender.follower_match_index", + new String[] {"instance", "group", "follower"}, + new String[] {"851cb00a-af97-455a-b079-d94a77d2a936", + "group-C14654DE8C2C", + "65f881ea-8794-403d-be77-a030ed79c341"} + }, new Object[] { "ratis_grpc.log_appender.72caaf3a-fb1c-4da4-9cc0-a2ce21bb8e67@group" + "-72caaf3a-fb1c-4da4-9cc0-a2ce21bb8e67" diff --git a/pom.xml b/pom.xml index 74fbe8d4d95..eadaed7299d 100644 --- a/pom.xml +++ b/pom.xml @@ -78,7 +78,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs ${ozone.version} - 0.6.0-a320ae0-SNAPSHOT + 0.6.0-SNAPSHOT apache.snapshots.https Apache Development Snapshot Repository https://repository.apache.org/content/repositories/snapshots From 5f1fe3e0970a3c42e5e16684d6decf3663e87fd8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elek=20M=C3=A1rton?= Date: Tue, 17 Mar 2020 17:21:55 +0100 Subject: [PATCH 2/5] revert ratis version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index eadaed7299d..74fbe8d4d95 100644 --- a/pom.xml +++ b/pom.xml @@ -78,7 +78,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs ${ozone.version} - 0.6.0-SNAPSHOT + 0.6.0-a320ae0-SNAPSHOT apache.snapshots.https Apache Development Snapshot Repository https://repository.apache.org/content/repositories/snapshots From d56506a4f8b1ec27737501dba44bf57377ae3f47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elek=20M=C3=A1rton?= Date: Thu, 19 Mar 2020 13:09:25 +0100 Subject: [PATCH 3/5] move the logging to the trace level --- .../hdds/server/http/RatisNameRewriteSampleBuilder.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/server/http/RatisNameRewriteSampleBuilder.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/server/http/RatisNameRewriteSampleBuilder.java index 66476118876..418c62a8ede 100644 --- a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/server/http/RatisNameRewriteSampleBuilder.java +++ b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/server/http/RatisNameRewriteSampleBuilder.java @@ -61,11 +61,11 @@ public Sample createSample(String dropwizardName, String nameSuffix, List values = new ArrayList<>(additionalLabelValues); String name = normalizeRatisMetric(dropwizardName, names, values); - // if (LOG.isTraceEnabled()) { - LOG.info( + if (LOG.isTraceEnabled()) { + LOG.trace( "Ratis dropwizard {} metrics are converted to {} with tag " + "keys/values {},{}", dropwizardName, name, names, values); - // } + } return super .createSample(name, nameSuffix, names, From 1b36ef44ec0ec9eec9364668f3f2acf6db7350a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elek=20M=C3=A1rton?= Date: Thu, 19 Mar 2020 13:22:11 +0100 Subject: [PATCH 4/5] checkstyle fix --- .../hdds/server/http/RatisNameRewriteSampleBuilder.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/server/http/RatisNameRewriteSampleBuilder.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/server/http/RatisNameRewriteSampleBuilder.java index 418c62a8ede..cb8950c638b 100644 --- a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/server/http/RatisNameRewriteSampleBuilder.java +++ b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/server/http/RatisNameRewriteSampleBuilder.java @@ -63,8 +63,8 @@ public Sample createSample(String dropwizardName, String nameSuffix, if (LOG.isTraceEnabled()) { LOG.trace( - "Ratis dropwizard {} metrics are converted to {} with tag " - + "keys/values {},{}", dropwizardName, name, names, values); + "Ratis dropwizard {} metrics are converted to {} with tag " + + "keys/values {},{}", dropwizardName, name, names, values); } return super .createSample(name, nameSuffix, From e2f981c3732c3b444daa87e29d1466c3bb9dcc6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elek=20M=C3=A1rton?= Date: Tue, 24 Mar 2020 15:07:13 +0100 Subject: [PATCH 5/5] retrigger build