Repository: hadoop Updated Branches: refs/heads/branch-2 6ee66be2f -> be04535f1 refs/heads/trunk a6728a013 -> 22a2b2231
YARN-4669. Fix logging statements in resource manager's Application class. Contributed by Sidharta Seethana. (cherry picked from commit a4a30c789146c4e824fcc6ebcf10405711120eaa) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/be04535f Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/be04535f Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/be04535f Branch: refs/heads/branch-2 Commit: be04535f1ae77d6a46a82961cf5cb713f7f0db88 Parents: 6ee66be Author: Varun Vasudev <[email protected]> Authored: Thu Feb 4 13:48:22 2016 +0530 Committer: Varun Vasudev <[email protected]> Committed: Thu Feb 4 13:51:08 2016 +0530 ---------------------------------------------------------------------- hadoop-yarn-project/CHANGES.txt | 3 +++ .../hadoop/yarn/server/resourcemanager/Application.java | 10 +++++++--- 2 files changed, 10 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/be04535f/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 19deef0..7859fea 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -136,6 +136,9 @@ Release 2.9.0 - UNRELEASED YARN-4594. container-executor fails to remove directory tree when chmod required (Colin Patrick McCabe via jlowe) + YARN-4669. Fix logging statements in resource manager's Application class. + (Seethana Sidharta via vvasudev) + Release 2.8.0 - UNRELEASED INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/be04535f/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/Application.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/Application.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/Application.java index b536546..17cf885 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/Application.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/Application.java @@ -324,9 +324,13 @@ public class Application { Allocation allocation = resourceManager.getResourceScheduler().allocate( applicationAttemptId, new ArrayList<ResourceRequest>(ask), new ArrayList<ContainerId>(), null, null, null, null); - System.out.println("-=======" + applicationAttemptId); - System.out.println("----------" + resourceManager.getRMContext().getRMApps() - .get(applicationId).getRMAppAttempt(applicationAttemptId)); + + if (LOG.isInfoEnabled()) { + LOG.info("-=======" + applicationAttemptId + System.lineSeparator() + + "----------" + resourceManager.getRMContext().getRMApps() + .get(applicationId).getRMAppAttempt(applicationAttemptId)); + } + List<Container> containers = allocation.getContainers(); // Clear state for next interaction with ResourceManager
