Repository: hadoop Updated Branches: refs/heads/branch-2 fb909554a -> 5047ee56a
HADOOP-12602. TestMetricsSystemImpl#testQSize occasionally fails. Contributed by Masatake Iwasaki. (cherry picked from commit eee0cf4611b02171e8a043f1cc5f7dbad47fc3b4) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/5047ee56 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/5047ee56 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/5047ee56 Branch: refs/heads/branch-2 Commit: 5047ee56af9edd2e6240286e2238b638a738f570 Parents: fb90955 Author: Akira Ajisaka <[email protected]> Authored: Fri Dec 11 16:18:30 2015 +0900 Committer: Akira Ajisaka <[email protected]> Committed: Fri Dec 11 16:18:58 2015 +0900 ---------------------------------------------------------------------- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ .../org/apache/hadoop/metrics2/impl/TestMetricsSystemImpl.java | 1 + 2 files changed, 4 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/5047ee56/hadoop-common-project/hadoop-common/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index e06cbe2..f22da24 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -921,6 +921,9 @@ Release 2.7.3 - UNRELEASED HADOOP-12565. Replace DSA with RSA for SSH key type in SingleCluster.md. (Mingliang Liu via aajisaka) + HADOOP-12602. TestMetricsSystemImpl#testQSize occasionally fails. + (Masatake Iwasaki via aajisaka) + Release 2.7.2 - UNRELEASED INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/5047ee56/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/metrics2/impl/TestMetricsSystemImpl.java ---------------------------------------------------------------------- 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 ecf2cc8..0463f48 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 @@ -441,6 +441,7 @@ public class TestMetricsSystemImpl { @Test public void testQSize() throws Exception { new ConfigBuilder().add("*.period", 8) + .add("*.queue.capacity", 2) .add("test.sink.test.class", TestSink.class.getName()) .save(TestMetricsConfig.getTestFilename("hadoop-metrics2-test")); MetricsSystemImpl ms = new MetricsSystemImpl("Test");
