You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ar...@apache.org on 2015/07/27 23:58:33 UTC
[22/37] hadoop git commit: YARN-3973. Recent changes to application
priority management break reservation system from YARN-1051 (Carlo Curino via
wangda)
YARN-3973. Recent changes to application priority management break reservation system from YARN-1051 (Carlo Curino via wangda)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/a3bd7b4a
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/a3bd7b4a
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/a3bd7b4a
Branch: refs/heads/HDFS-7240
Commit: a3bd7b4a59b3664273dc424f240356838213d4e7
Parents: ff9c13e
Author: Wangda Tan <wa...@apache.org>
Authored: Fri Jul 24 16:44:18 2015 -0700
Committer: Wangda Tan <wa...@apache.org>
Committed: Fri Jul 24 16:44:18 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/a3bd7b4a/hadoop-yarn-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index c295784..55258a6 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -667,7 +667,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)
@@ -678,6 +679,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/a3bd7b4a/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);