Repository: hadoop Updated Branches: refs/heads/branch-2 2cf714123 -> 4ba2e1ae9
YARN-3973. Recent changes to application priority management break reservation system from YARN-1051 (Carlo Curino via wangda) (cherry picked from commit a3bd7b4a59b3664273dc424f240356838213d4e7) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/4ba2e1ae Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/4ba2e1ae Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/4ba2e1ae Branch: refs/heads/branch-2 Commit: 4ba2e1ae95861726f0b95eb827d2b72637679732 Parents: 2cf7141 Author: Wangda Tan <[email protected]> Authored: Fri Jul 24 16:44:18 2015 -0700 Committer: Wangda Tan <[email protected]> Committed: Fri Jul 24 16:45:06 2015 -0700 ---------------------------------------------------------------------- hadoop-yarn-project/CHANGES.txt | 6 +++++- .../resourcemanager/scheduler/capacity/CapacityScheduler.java | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/4ba2e1ae/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index c0748ad..b803b89 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -615,7 +615,8 @@ Release 2.8.0 - UNRELEASED YARN-3956. Fix TestNodeManagerHardwareUtils fails on Mac (Varun Vasudev via wangda) - YARN-3941. Proportional Preemption policy should try to avoid sending duplicate PREEMPT_CONTAINER event to scheduler. (Sunil G via wangda) + YARN-3941. Proportional Preemption policy should try to avoid sending duplicate + PREEMPT_CONTAINER event to scheduler. (Sunil G via wangda) YARN-3900. Protobuf layout of yarn_security_token causes errors in other protos that include it (adhoot via rkanter) @@ -626,6 +627,9 @@ Release 2.8.0 - UNRELEASED YARN-3957. FairScheduler NPE In FairSchedulerQueueInfo causing scheduler page to return 500. (Anubhav Dhoot via kasha) + YARN-3973. Recent changes to application priority management break + reservation system from YARN-1051. (Carlo Curino via wangda) + Release 2.7.2 - UNRELEASED INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/4ba2e1ae/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacityScheduler.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/capacity/CapacityScheduler.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacityScheduler.java index 68e608a..0b39d35 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacityScheduler.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacityScheduler.java @@ -1867,7 +1867,7 @@ public class CapacityScheduler extends private Priority getDefaultPriorityForQueue(String queueName) { Queue queue = getQueue(queueName); - if (null == queue) { + if (null == queue || null == queue.getDefaultApplicationPriority()) { // Return with default application priority return Priority.newInstance(CapacitySchedulerConfiguration .DEFAULT_CONFIGURATION_APPLICATION_PRIORITY);
