Repository: hadoop Updated Branches: refs/heads/branch-2 b8fe1a747 -> fef5efa0c
YARN-1615. Fix typos in delay scheduler's description. Contributed by Akira Ajisaka. (cherry picked from commit b8a14efdf535d42bcafa58d380bd2c7f4d36f8cb) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/fef5efa0 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/fef5efa0 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/fef5efa0 Branch: refs/heads/branch-2 Commit: fef5efa0cb6a0d651e288d1b46c6cde9521bd896 Parents: b8fe1a7 Author: Tsuyoshi Ozawa <[email protected]> Authored: Thu Feb 19 10:24:07 2015 +0900 Committer: Tsuyoshi Ozawa <[email protected]> Committed: Thu Feb 19 10:24:40 2015 +0900 ---------------------------------------------------------------------- hadoop-yarn-project/CHANGES.txt | 3 +++ .../server/resourcemanager/scheduler/fair/FSAppAttempt.java | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/fef5efa0/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 2a9fbe0..44266b3 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -581,6 +581,9 @@ Release 2.7.0 - UNRELEASED YARN-3132. RMNodeLabelsManager should remove node from node-to-label mapping when node becomes deactivated. (Wangda Tan via jianhe) + YARN-1615. Fix typos in description about delay scheduling. (Akira Ajisaka via + ozawa) + Release 2.6.0 - 2014-11-18 INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/fef5efa0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FSAppAttempt.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/FSAppAttempt.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/FSAppAttempt.java index 7d26396..67103d1 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/FSAppAttempt.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/FSAppAttempt.java @@ -80,10 +80,10 @@ public class FSAppAttempt extends SchedulerApplicationAttempt /** * Delay scheduling: We often want to prioritize scheduling of node-local - * containers over rack-local or off-switch containers. To acheive this - * we first only allow node-local assigments for a given prioirty level, + * containers over rack-local or off-switch containers. To achieve this + * we first only allow node-local assignments for a given priority level, * then relax the locality threshold once we've had a long enough period - * without succesfully scheduling. We measure both the number of "missed" + * without successfully scheduling. We measure both the number of "missed" * scheduling opportunities since the last container was scheduled * at the current allowed level and the time since the last container * was scheduled. Currently we use only the former.
