From ca9a32c9512cc59b4701879634b348cabbd15ed6 Mon Sep 17 00:00:00 2001 From: Jonathan Turner Eagles Date: Thu, 5 Dec 2013 17:37:13 +0000 Subject: [PATCH] HADOOP-10058. TestMetricsSystemImpl#testInitFirstVerifyStopInvokedImmediately fails on trunk (Chen He via jeagles) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1548215 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ .../org/apache/hadoop/metrics2/impl/TestMetricsSystemImpl.java | 1 + 2 files changed, 4 insertions(+) diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index f03bbcaf17..9241783c09 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -462,6 +462,9 @@ Release 2.4.0 - UNRELEASED HADOOP-10129. Distcp may succeed when it fails (daryn) + HADOOP-10058. TestMetricsSystemImpl#testInitFirstVerifyStopInvokedImmediately + fails on trunk (Chen He via jeagles) + Release 2.3.0 - UNRELEASED INCOMPATIBLE CHANGES diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/metrics2/impl/TestMetricsSystemImpl.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/metrics2/impl/TestMetricsSystemImpl.java index 3b9861ea93..6d9024e3ab 100644 --- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/metrics2/impl/TestMetricsSystemImpl.java +++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/metrics2/impl/TestMetricsSystemImpl.java @@ -85,6 +85,7 @@ public static class TestSink implements MetricsSink { } @Test public void testInitFirstVerifyStopInvokedImmediately() throws Exception { + DefaultMetricsSystem.shutdown(); new ConfigBuilder().add("*.period", 8) //.add("test.sink.plugin.urls", getPluginUrlsAsString()) .add("test.sink.test.class", TestSink.class.getName())