HADOOP-15442. ITestS3AMetrics.testMetricsRegister can't know metrics source's name. Contributed by Sean Mackrory.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/b6708374 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/b6708374 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/b6708374 Branch: refs/heads/HDDS-4 Commit: b6708374692e6c4d786e2f3f1f45cc7aa1e4e88f Parents: 2bb647b Author: Steve Loughran <ste...@apache.org> Authored: Tue May 15 16:13:56 2018 +0100 Committer: Steve Loughran <ste...@apache.org> Committed: Tue May 15 16:13:56 2018 +0100 ---------------------------------------------------------------------- .../main/java/org/apache/hadoop/fs/s3a/S3AInstrumentation.java | 3 --- .../src/test/java/org/apache/hadoop/fs/s3a/ITestS3AMetrics.java | 5 ----- 2 files changed, 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/b6708374/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/S3AInstrumentation.java ---------------------------------------------------------------------- diff --git a/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/S3AInstrumentation.java b/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/S3AInstrumentation.java index 29ee0c5..26ecefd 100644 --- a/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/S3AInstrumentation.java +++ b/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/S3AInstrumentation.java @@ -267,9 +267,6 @@ public class S3AInstrumentation implements Closeable, MetricsSource { number = ++metricsSourceNameCounter; } String msName = METRICS_SOURCE_BASENAME + number; - if (number > 1) { - msName = msName + number; - } metricsSourceName = msName + "-" + name.getHost(); metricsSystem.register(metricsSourceName, "", this); } http://git-wip-us.apache.org/repos/asf/hadoop/blob/b6708374/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/ITestS3AMetrics.java ---------------------------------------------------------------------- diff --git a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/ITestS3AMetrics.java b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/ITestS3AMetrics.java index e92ce78..972c665 100644 --- a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/ITestS3AMetrics.java +++ b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/ITestS3AMetrics.java @@ -38,11 +38,6 @@ public class ITestS3AMetrics extends AbstractS3ATestBase { Path dest = path("testMetricsRegister"); ContractTestUtils.touch(fs, dest); - String targetMetricSource = "S3AMetrics1" + "-" + fs.getBucket(); - assertNotNull("No metrics under test fs for " + targetMetricSource, - fs.getInstrumentation().getMetricsSystem() - .getSource(targetMetricSource)); - MutableCounterLong fileCreated = (MutableCounterLong) fs.getInstrumentation().getRegistry() .get(Statistic.FILES_CREATED.getSymbol()); --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
