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 A4F32200D4A for ; Tue, 14 Nov 2017 00:29:00 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id A2237160C09; Mon, 13 Nov 2017 23:29:00 +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 E8466160C07 for ; Tue, 14 Nov 2017 00:28:59 +0100 (CET) Received: (qmail 91096 invoked by uid 500); 13 Nov 2017 23:28:58 -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 90867 invoked by uid 99); 13 Nov 2017 23:28:58 -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; Mon, 13 Nov 2017 23:28:58 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id D9015DFDCC; Mon, 13 Nov 2017 23:28:57 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: kkaranasos@apache.org To: common-commits@hadoop.apache.org Date: Mon, 13 Nov 2017 23:28:58 -0000 Message-Id: <3de27303c28242288171c991c06c2dfd@git.apache.org> In-Reply-To: <0f707ce6fc684de4b3375402a2085272@git.apache.org> References: <0f707ce6fc684de4b3375402a2085272@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [02/50] [abbrv] hadoop git commit: YARN-7360. TestRM.testNMTokenSentForNormalContainer() should be scheduler agnostic. archived-at: Mon, 13 Nov 2017 23:29:00 -0000 YARN-7360. TestRM.testNMTokenSentForNormalContainer() should be scheduler agnostic. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/8f214dc4 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/8f214dc4 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/8f214dc4 Branch: refs/heads/YARN-6592 Commit: 8f214dc4f8423250947a3f0027f70b9ab402ab62 Parents: cbc632d Author: Haibo Chen Authored: Mon Nov 6 15:45:37 2017 -0800 Committer: Haibo Chen Committed: Mon Nov 6 15:45:37 2017 -0800 ---------------------------------------------------------------------- .../hadoop/yarn/server/resourcemanager/TestRM.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/8f214dc4/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRM.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/TestRM.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRM.java index f912f68..3679319 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRM.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRM.java @@ -21,7 +21,7 @@ package org.apache.hadoop.yarn.server.resourcemanager; import com.google.common.base.Supplier; import org.apache.hadoop.test.GenericTestUtils; import org.apache.hadoop.yarn.event.DrainDispatcher; -import org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.FairSchedulerConfiguration; +import org.apache.hadoop.yarn.server.resourcemanager.scheduler.AbstractYarnScheduler; import org.junit.Before; import static org.mockito.Matchers.argThat; import static org.mockito.Mockito.doNothing; @@ -73,7 +73,6 @@ import org.apache.hadoop.yarn.server.resourcemanager.rmapp.attempt.RMAppAttemptE import org.apache.hadoop.yarn.server.resourcemanager.rmapp.attempt.RMAppAttemptEventType; import org.apache.hadoop.yarn.server.resourcemanager.rmapp.attempt.RMAppAttemptState; import org.apache.hadoop.yarn.server.resourcemanager.rmnode.RMNode; -import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacityScheduler; import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacitySchedulerConfiguration; import org.apache.hadoop.yarn.server.resourcemanager.security.NMTokenSecretManagerInRM; import org.apache.log4j.Level; @@ -205,8 +204,6 @@ public class TestRM extends ParameterizedSchedulerTestBase { // corresponding NM Token. @Test (timeout = 20000) public void testNMTokenSentForNormalContainer() throws Exception { - conf.set(YarnConfiguration.RM_SCHEDULER, - CapacityScheduler.class.getCanonicalName()); MockRM rm = new MockRM(conf); rm.start(); MockNM nm1 = rm.registerNode("h1:1234", 5120); @@ -215,8 +212,10 @@ public class TestRM extends ParameterizedSchedulerTestBase { // Call getNewContainerId to increase container Id so that the AM container // Id doesn't equal to one. - CapacityScheduler cs = (CapacityScheduler) rm.getResourceScheduler(); - cs.getApplicationAttempt(attempt.getAppAttemptId()).getNewContainerId(); + AbstractYarnScheduler scheduler = (AbstractYarnScheduler) + rm.getResourceScheduler(); + scheduler.getApplicationAttempt(attempt.getAppAttemptId()). + getNewContainerId(); MockAM am = MockRM.launchAM(app, rm, nm1); // am container Id not equal to 1. --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org For additional commands, e-mail: common-commits-help@hadoop.apache.org