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/AbstractYarnScheduler.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/AbstractYarnScheduler.java index e76287d..e12a178 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/AbstractYarnScheduler.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/AbstractYarnScheduler.java @@ -531,7 +531,7 @@ public void recoverContainersOnNode(List containerReports, } // create container - RMContainer rmContainer = recoverAndCreateContainer(container, nm); + RMContainer rmContainer = recoverAndCreateContainer(container, nm, schedulerApp.getQueue().getQueueName()); // recover RMContainer rmContainer.handle( @@ -581,7 +581,7 @@ public void recoverContainersOnNode(List containerReports, } private RMContainer recoverAndCreateContainer(NMContainerStatus status, - RMNode node) { + RMNode node, String queueName) { Container container = Container.newInstance(status.getContainerId(), node.getNodeID(), node.getHttpAddress(), status.getAllocatedResource(), @@ -596,6 +596,7 @@ private RMContainer recoverAndCreateContainer(NMContainerStatus status, SchedulerRequestKey.extractFrom(container), attemptId, node.getNodeID(), applications.get(attemptId.getApplicationId()).getUser(), rmContext, status.getCreationTime(), status.getNodeLabelExpression()); + ((RMContainerImpl) rmContainer).setQueueName(queueName); return rmContainer; }