Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id BE5A0200D0A for ; Wed, 4 Oct 2017 23:08:57 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id BCB2C1609DD; Wed, 4 Oct 2017 21:08:57 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 0AAF61609D6 for ; Wed, 4 Oct 2017 23:08:56 +0200 (CEST) Received: (qmail 50367 invoked by uid 500); 4 Oct 2017 21:08:55 -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 50355 invoked by uid 99); 4 Oct 2017 21:08:55 -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, 04 Oct 2017 21:08:55 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 79604E053F; Wed, 4 Oct 2017 21:08:55 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: aajisaka@apache.org To: common-commits@hadoop.apache.org Message-Id: <795ae3c989ae400fb56875d04e5d0d6d@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: hadoop git commit: YARN-7044. TestContainerAllocation#testAMContainerAllocationWhenDNSUnavailable fails. Date: Wed, 4 Oct 2017 21:08:55 +0000 (UTC) archived-at: Wed, 04 Oct 2017 21:08:57 -0000 Repository: hadoop Updated Branches: refs/heads/branch-2 3ecbfff93 -> 5508b9b7c YARN-7044. TestContainerAllocation#testAMContainerAllocationWhenDNSUnavailable fails. (cherry picked from commit 2df1b2ac0509ba10fff606ada7e9b3562c12dd16) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/5508b9b7 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/5508b9b7 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/5508b9b7 Branch: refs/heads/branch-2 Commit: 5508b9b7c8c08e899796f307bad0d4175920d1f1 Parents: 3ecbfff Author: Akira Ajisaka Authored: Thu Oct 5 06:07:32 2017 +0900 Committer: Akira Ajisaka Committed: Thu Oct 5 06:08:46 2017 +0900 ---------------------------------------------------------------------- .../scheduler/capacity/TestContainerAllocation.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/5508b9b7/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestContainerAllocation.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestContainerAllocation.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestContainerAllocation.java index 906febf..b1ca72a 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestContainerAllocation.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestContainerAllocation.java @@ -29,6 +29,7 @@ import org.apache.hadoop.security.SecurityUtilTestHelper; import org.apache.hadoop.yarn.api.protocolrecords.AllocateResponse; import org.apache.hadoop.yarn.api.records.Container; import org.apache.hadoop.yarn.api.records.ContainerId; +import org.apache.hadoop.yarn.api.records.ExecutionType; import org.apache.hadoop.yarn.api.records.LogAggregationContext; import org.apache.hadoop.yarn.api.records.NodeId; import org.apache.hadoop.yarn.api.records.Priority; @@ -294,11 +295,12 @@ public class TestContainerAllocation { int containerVersion, NodeId nodeId, String appSubmitter, Resource capability, Priority priority, long createTime, LogAggregationContext logAggregationContext, String nodeLabelExp, - ContainerType containerType) { + ContainerType containerType, ExecutionType executionType) { numRetries++; return super.createContainerToken(containerId, containerVersion, nodeId, appSubmitter, capability, priority, createTime, - logAggregationContext, nodeLabelExp, containerType); + logAggregationContext, nodeLabelExp, containerType, + executionType); } }; } --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org For additional commands, e-mail: common-commits-help@hadoop.apache.org