Repository: hadoop Updated Branches: refs/heads/branch-2 f1ee2eaf8 -> 3863342ca
YARN-3794. TestRMEmbeddedElector fails because of ambiguous LOG reference. Contributed by Chengbing Liu. (cherry picked from commit d8dcfa98e3ca6a6fea414fd503589bb83b7a9c51) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/3863342c Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/3863342c Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/3863342c Branch: refs/heads/branch-2 Commit: 3863342ca91494a311cf5524f0494a66a6fca842 Parents: f1ee2ea Author: Devaraj K <[email protected]> Authored: Fri Jun 12 13:42:49 2015 +0530 Committer: Devaraj K <[email protected]> Committed: Fri Jun 12 13:45:05 2015 +0530 ---------------------------------------------------------------------- hadoop-yarn-project/CHANGES.txt | 3 +++ .../yarn/server/resourcemanager/TestRMEmbeddedElector.java | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/3863342c/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 4a83ed5..30035c7 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -473,6 +473,9 @@ Release 2.8.0 - UNRELEASED YARN-3778. Fix Yarn resourcemanger CLI usage. (Brahma Reddy Battula via xgong) + YARN-3794. TestRMEmbeddedElector fails because of ambiguous LOG reference. + (Chengbing Liu via devaraj) + Release 2.7.1 - UNRELEASED INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/3863342c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMEmbeddedElector.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMEmbeddedElector.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMEmbeddedElector.java index 1b0bf7e..20b1c0e 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMEmbeddedElector.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMEmbeddedElector.java @@ -102,9 +102,9 @@ public class TestRMEmbeddedElector extends ClientBaseWithFixes { ServiceFailedException { try { callbackCalled.set(true); - LOG.info("Callback called. Sleeping now"); + TestRMEmbeddedElector.LOG.info("Callback called. Sleeping now"); Thread.sleep(delayMs); - LOG.info("Sleep done"); + TestRMEmbeddedElector.LOG.info("Sleep done"); } catch (InterruptedException e) { e.printStackTrace(); }
