From common-commits-return-82207-archive-asf-public=cust-asf.ponee.io@hadoop.apache.org Wed May 2 21:21:44 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 0CC11180675 for ; Wed, 2 May 2018 21:21:43 +0200 (CEST) Received: (qmail 3974 invoked by uid 500); 2 May 2018 19:21:38 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 2935 invoked by uid 99); 2 May 2018 19:21:37 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 May 2018 19:21:37 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C5597F6550; Wed, 2 May 2018 19:21:36 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: shv@apache.org To: common-commits@hadoop.apache.org Date: Wed, 02 May 2018 19:21:49 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [14/50] [abbrv] hadoop git commit: YARN-8165. Incorrect queue name logging in AbstractContainerAllocator. Contributed by Weiwei Yan. YARN-8165. Incorrect queue name logging in AbstractContainerAllocator. Contributed by Weiwei Yan. (cherry picked from commit dd5e18c4aecba56f140c3cc11affc2cb5e61c79d) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/f37f680a Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/f37f680a Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/f37f680a Branch: refs/heads/YARN-8200 Commit: f37f680a4e795daa7f40d3bb903cb7da1a619ead Parents: b9dc0e5 Author: Inigo Goiri Authored: Mon Apr 16 16:52:17 2018 -0700 Committer: Inigo Goiri Committed: Mon Apr 16 17:07:38 2018 -0700 ---------------------------------------------------------------------- .../capacity/allocator/AbstractContainerAllocator.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/f37f680a/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 5809d86..d3ab01e 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( --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org For additional commands, e-mail: common-commits-help@hadoop.apache.org