YARN-3794. TestRMEmbeddedElector fails because of ambiguous LOG reference. Contributed by Chengbing Liu.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/1bddd3f0 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/1bddd3f0 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/1bddd3f0 Branch: refs/heads/YARN-2928 Commit: 1bddd3f0b5314e68548ebc51b0fd406b8ae8f787 Parents: 78cf309 Author: Devaraj K <[email protected]> Authored: Fri Jun 12 13:42:49 2015 +0530 Committer: Zhijie Shen <[email protected]> Committed: Thu Jun 18 11:10:04 2015 -0700 ---------------------------------------------------------------------- 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/1bddd3f0/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index b692fa4..1776a89 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -621,6 +621,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/1bddd3f0/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(); }
