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 wa...@apache.org on 2015/04/08 19:58:04 UTC

hadoop git commit: YARN-3459. Fix failiure of TestLog4jWarningErrorMetricsAppender. (Varun Vasudev via wangda)

Repository: hadoop
Updated Branches:
  refs/heads/trunk f4b3fc562 -> 7af086a51


YARN-3459. Fix failiure of TestLog4jWarningErrorMetricsAppender. (Varun Vasudev via wangda)


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

Branch: refs/heads/trunk
Commit: 7af086a515d573dc90ea4deec7f4e3f23622e0e8
Parents: f4b3fc5
Author: Wangda Tan <wa...@apache.org>
Authored: Wed Apr 8 10:57:48 2015 -0700
Committer: Wangda Tan <wa...@apache.org>
Committed: Wed Apr 8 10:57:48 2015 -0700

----------------------------------------------------------------------
 hadoop-yarn-project/CHANGES.txt                                   | 3 +++
 .../hadoop/yarn/util/TestLog4jWarningErrorMetricsAppender.java    | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/7af086a5/hadoop-yarn-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index d5f6ce0..7f0ddd8 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -156,6 +156,9 @@ Release 2.8.0 - UNRELEASED
     YARN-3457. NPE when NodeManager.serviceInit fails and stopRecoveryStore called.
     (Bibin A Chundatt via ozawa)
 
+    YARN-3459. Fix failiure of TestLog4jWarningErrorMetricsAppender.
+    (Varun Vasudev via wangda)
+
 Release 2.7.0 - UNRELEASED
 
   INCOMPATIBLE CHANGES

http://git-wip-us.apache.org/repos/asf/hadoop/blob/7af086a5/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/util/TestLog4jWarningErrorMetricsAppender.java
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/util/TestLog4jWarningErrorMetricsAppender.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/util/TestLog4jWarningErrorMetricsAppender.java
index 61d4c4c..e788e80 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/util/TestLog4jWarningErrorMetricsAppender.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/util/TestLog4jWarningErrorMetricsAppender.java
@@ -84,7 +84,7 @@ public class TestLog4jWarningErrorMetricsAppender {
     Assert.assertEquals(1, appender.getErrorCounts(cutoff).get(0).longValue());
     Assert.assertEquals(1, appender.getErrorMessagesAndCounts(cutoff).get(0)
       .size());
-    Thread.sleep(2000);
+    Thread.sleep(3000);
     Assert.assertEquals(1, appender.getErrorCounts(cutoff).size());
     Assert.assertEquals(0, appender.getErrorCounts(cutoff).get(0).longValue());
     Assert.assertEquals(0, appender.getErrorMessagesAndCounts(cutoff).get(0)