From 836e8f3e6905c918a0781ba9eadd1467f9ba610b Mon Sep 17 00:00:00 2001
From: Wangda Tan <wangda@apache.org>
Date: Mon, 22 May 2017 14:57:54 -0700
Subject: [PATCH] YARN-6493. Print requested node partition in assignContainer
 logs. (Jonathan Hung via wangda)

Change-Id: I3c5c012eb8d0887a4a37d58662bc37aac07ea86e
---
 .../allocator/AbstractContainerAllocator.java      | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 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 bc317884174..b1466aa3a75 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
@@ -88,16 +88,24 @@ protected CSAssignment getCSAssignmentFromAllocateResult(
       } else if (result.getAllocationState() == AllocationState.ALLOCATED){
         // This is a new container
         // Inform the ordering policy
+        RMContainer allocatedContainer = application.getRMContainer(
+            updatedContainer.getId());
+        if (allocatedContainer == null) {
+          LOG.warn("Allocated container for containerId "
+              + updatedContainer.getId() + " is null.");
+        }
         LOG.info("assignedContainer" + " application attempt="
             + application.getApplicationAttemptId() + " container="
             + updatedContainer.getId() + " queue=" + this + " clusterResource="
-            + clusterResource + " type=" + assignment.getType());
+            + clusterResource + " type=" + assignment.getType()
+            + " requestedPartition="
+            + (allocatedContainer == null ? "null" :
+                allocatedContainer.getNodeLabelExpression()));
 
         application
             .getCSLeafQueue()
             .getOrderingPolicy()
-            .containerAllocated(application,
-                application.getRMContainer(updatedContainer.getId()));
+            .containerAllocated(application, allocatedContainer);
 
         assignment.getAssignmentInformation().addAllocationDetails(
             updatedContainer.getId(),