YARN-4387. Fix typo in FairScheduler log message. Contributed by Xin Wang.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/28dfe721 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/28dfe721 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/28dfe721 Branch: refs/heads/yarn-2877 Commit: 28dfe721b86ccbaf2ddcfb7e709b226ac766803a Parents: 8c0133f Author: Tsuyoshi Ozawa <oz...@apache.org> Authored: Tue Nov 24 17:35:38 2015 +0900 Committer: Tsuyoshi Ozawa <oz...@apache.org> Committed: Tue Nov 24 19:24:01 2015 +0900 ---------------------------------------------------------------------- hadoop-yarn-project/CHANGES.txt | 2 ++ .../yarn/server/resourcemanager/scheduler/fair/FairScheduler.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/28dfe721/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 6558e40..204c338 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -1064,6 +1064,8 @@ Release 2.8.0 - UNRELEASED YARN-4298. Fix findbugs warnings in hadoop-yarn-common. (Sunil G via aajisaka) + YARN-4387. Fix typo in FairScheduler log message. (Xin Wang via ozawa) + Release 2.7.3 - UNRELEASED INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/28dfe721/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 f1839f5..04977a6 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 @@ -500,7 +500,7 @@ public class FairScheduler extends // containers on the RMNode (see SchedulerNode.releaseContainer()). completedContainer(container, status, RMContainerEventType.KILL); LOG.info("Killing container" + container + - " (after waiting for premption for " + + " (after waiting for preemption for " + (getClock().getTime() - time) + "ms)"); } } else {
