You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by aa...@apache.org on 2015/12/11 08:26:46 UTC

hadoop git commit: HADOOP-12602. TestMetricsSystemImpl#testQSize occasionally fails. Contributed by Masatake Iwasaki.

Repository: hadoop
Updated Branches:
  refs/heads/trunk 7f393a6f6 -> eee0cf461


HADOOP-12602. TestMetricsSystemImpl#testQSize occasionally fails. Contributed by Masatake Iwasaki.


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/eee0cf46
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/eee0cf46
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/eee0cf46

Branch: refs/heads/trunk
Commit: eee0cf4611b02171e8a043f1cc5f7dbad47fc3b4
Parents: 7f393a6
Author: Akira Ajisaka <aa...@apache.org>
Authored: Fri Dec 11 16:18:30 2015 +0900
Committer: Akira Ajisaka <aa...@apache.org>
Committed: Fri Dec 11 16:18:30 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/eee0cf46/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 61ef7ba..93766f9 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -1540,6 +1540,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/eee0cf46/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");