From 37d7395773b5bb24aa522db38a2602df9a5ac184 Mon Sep 17 00:00:00 2001 From: Devaraj K Date: Thu, 2 Jul 2015 10:20:31 +0530 Subject: [PATCH] YARN-3875. FSSchedulerNode#reserveResource() doesn't print Application Id properly in log. Contributed by Bibin A Chundatt. --- hadoop-yarn-project/CHANGES.txt | 3 +++ .../scheduler/fair/FSSchedulerNode.java | 11 ++++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 683954805e..2009b47ad5 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -586,6 +586,9 @@ Release 2.8.0 - UNRELEASED YARN-3830. AbstractYarnScheduler.createReleaseCache may try to clean a null attempt. (nijel via devaraj) + YARN-3875. FSSchedulerNode#reserveResource() doesn't print Application Id + properly in log. (Bibin A Chundatt via devaraj) + Release 2.7.2 - UNRELEASED INCOMPATIBLE CHANGES diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FSSchedulerNode.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FSSchedulerNode.java index be08dff397..c86201ab58 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FSSchedulerNode.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FSSchedulerNode.java @@ -68,12 +68,13 @@ public class FSSchedulerNode extends SchedulerNode { " on node " + this); } - LOG.info("Updated reserved container " + - container.getContainer().getId() + " on node " + - this + " for application " + application); + LOG.info("Updated reserved container " + container.getContainer().getId() + + " on node " + this + " for application " + + application.getApplicationId()); } else { - LOG.info("Reserved container " + container.getContainer().getId() + - " on node " + this + " for application " + application); + LOG.info("Reserved container " + container.getContainer().getId() + + " on node " + this + " for application " + + application.getApplicationId()); } setReservedContainer(container); this.reservedAppSchedulable = (FSAppAttempt) application;