From f37f680a4e795daa7f40d3bb903cb7da1a619ead Mon Sep 17 00:00:00 2001 From: Inigo Goiri Date: Mon, 16 Apr 2018 16:52:17 -0700 Subject: [PATCH] YARN-8165. Incorrect queue name logging in AbstractContainerAllocator. Contributed by Weiwei Yan. (cherry picked from commit dd5e18c4aecba56f140c3cc11affc2cb5e61c79d) --- .../capacity/allocator/AbstractContainerAllocator.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) 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/allocator/AbstractContainerAllocator.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/allocator/AbstractContainerAllocator.java index 5809d86e6d0..d3ab01e0390 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/allocator/AbstractContainerAllocator.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/allocator/AbstractContainerAllocator.java @@ -97,7 +97,8 @@ public abstract class AbstractContainerAllocator { // This is a reserved container LOG.info("Reserved container " + " application=" + application.getApplicationId() + " resource=" + allocatedResource - + " queue=" + this.toString() + " cluster=" + clusterResource); + + " queue=" + appInfo.getQueueName() + + " cluster=" + clusterResource); assignment.getAssignmentInformation().addReservationDetails( updatedContainer, application.getCSLeafQueue().getQueuePath()); assignment.getAssignmentInformation().incrReservations(); @@ -125,9 +126,9 @@ public abstract class AbstractContainerAllocator { // Inform the ordering policy LOG.info("assignedContainer" + " application attempt=" + application .getApplicationAttemptId() + " container=" + updatedContainer - .getContainerId() + " queue=" + this + " clusterResource=" - + clusterResource + " type=" + assignment.getType() - + " requestedPartition=" + .getContainerId() + " queue=" + appInfo.getQueueName() + + " clusterResource=" + clusterResource + + " type=" + assignment.getType() + " requestedPartition=" + updatedContainer.getNodeLabelExpression()); assignment.getAssignmentInformation().addAllocationDetails(