Repository: hadoop Updated Branches: refs/heads/branch-2 b7251723d -> 0b87ae27a
YARN-3495. Confusing log generated by FairScheduler. Contributed by Brahma Reddy Battula. (cherry picked from commit 105afd54779852c518b978101f23526143e234a5) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/0b87ae27 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/0b87ae27 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/0b87ae27 Branch: refs/heads/branch-2 Commit: 0b87ae27aadff1b16f95c5b61b53d597d2377dcc Parents: b725172 Author: Tsuyoshi Ozawa <[email protected]> Authored: Wed Apr 22 05:47:59 2015 +0900 Committer: Tsuyoshi Ozawa <[email protected]> Committed: Wed Apr 22 05:48:16 2015 +0900 ---------------------------------------------------------------------- hadoop-yarn-project/CHANGES.txt | 3 +++ .../server/resourcemanager/scheduler/fair/FairScheduler.java | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/0b87ae27/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 446f893..06b97e4 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -185,6 +185,9 @@ Release 2.8.0 - UNRELEASED YARN-3136. Fixed a synchronization problem of AbstractYarnScheduler#getTransferredContainers. (Sunil G via jianhe) + YARN-3495. Confusing log generated by FairScheduler. + (Brahma Reddy Battula via ozawa) + Release 2.7.1 - UNRELEASED INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/0b87ae27/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FairScheduler.java ---------------------------------------------------------------------- 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/FairScheduler.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/FairScheduler.java index a6c5416..f481de5 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/FairScheduler.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/FairScheduler.java @@ -796,7 +796,8 @@ public class FairScheduler extends protected synchronized void completedContainer(RMContainer rmContainer, ContainerStatus containerStatus, RMContainerEventType event) { if (rmContainer == null) { - LOG.info("Null container completed..."); + LOG.info("Container " + containerStatus.getContainerId() + + " completed with event " + event); return; } @@ -809,7 +810,7 @@ public class FairScheduler extends container.getId().getApplicationAttemptId().getApplicationId(); if (application == null) { LOG.info("Container " + container + " of" + - " unknown application attempt " + appId + + " finished application " + appId + " completed with event " + event); return; }
