Repository: hadoop Updated Branches: refs/heads/branch-2 ac32fa187 -> 97244b143
YARN-3459. Fix failiure of TestLog4jWarningErrorMetricsAppender. (Varun Vasudev via wangda) (cherry picked from commit 7af086a515d573dc90ea4deec7f4e3f23622e0e8) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/97244b14 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/97244b14 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/97244b14 Branch: refs/heads/branch-2 Commit: 97244b143ca72cb9dcd86b428f9408928985b545 Parents: ac32fa1 Author: Wangda Tan <[email protected]> Authored: Wed Apr 8 10:57:48 2015 -0700 Committer: Wangda Tan <[email protected]> Committed: Wed Apr 8 10:58:38 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/97244b14/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index d9e1754..7304071 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -108,6 +108,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/97244b14/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)
