Repository: hadoop Updated Branches: refs/heads/branch-2.8 cef5ef237 -> 836e8f3e6
YARN-6493. Print requested node partition in assignContainer logs. (Jonathan Hung via wangda) Change-Id: I3c5c012eb8d0887a4a37d58662bc37aac07ea86e Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/836e8f3e Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/836e8f3e Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/836e8f3e Branch: refs/heads/branch-2.8 Commit: 836e8f3e6905c918a0781ba9eadd1467f9ba610b Parents: cef5ef2 Author: Wangda Tan <[email protected]> Authored: Mon May 22 14:57:54 2017 -0700 Committer: Wangda Tan <[email protected]> Committed: Mon May 22 14:57:54 2017 -0700 ---------------------------------------------------------------------- .../allocator/AbstractContainerAllocator.java | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/836e8f3e/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 ---------------------------------------------------------------------- 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 bc31788..b1466aa 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 @@ public abstract class AbstractContainerAllocator { } 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(), --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
