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 3fc3019..4fbbb8d 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 @@ -1043,8 +1043,12 @@ private synchronized void attemptScheduling(FSSchedulerNode node) { + reservedAppSchedulable.getApplicationAttemptId() + " on node: " + node); } - - node.getReservedAppSchedulable().assignReservedContainer(node); + String queueName = reservedAppSchedulable.getApp().getQueueName(); + FSQueue queue = queueMgr.getQueue(queueName); + if (Resources.fitsIn(queue.getResourceUsage(), queue.scheduler + .getAllocationConfiguration().getMaxResources(queueName))) { + node.getReservedAppSchedulable().assignReservedContainer(node); + } } } if (reservedAppSchedulable == null) {