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 2C320200CFC for ; Thu, 24 Aug 2017 03:10:00 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 2A3AD16A17D; Thu, 24 Aug 2017 01:10: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 72BB116A17B for ; Thu, 24 Aug 2017 03:09:59 +0200 (CEST) Received: (qmail 91855 invoked by uid 500); 24 Aug 2017 01:09:57 -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 91846 invoked by uid 99); 24 Aug 2017 01:09:57 -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; Thu, 24 Aug 2017 01:09:57 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 14113E088D; Thu, 24 Aug 2017 01:09:56 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: junping_du@apache.org To: common-commits@hadoop.apache.org Message-Id: <9d132cc9f54e416481eb08edb61bd109@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: hadoop git commit: YARN-7090. testRMRestartAfterNodeLabelDisabled get failed when CapacityScheduler is configured. Contributed by Wangda Tan. Date: Thu, 24 Aug 2017 01:09:56 +0000 (UTC) archived-at: Thu, 24 Aug 2017 01:10:00 -0000 Repository: hadoop Updated Branches: refs/heads/branch-2 8b2d5a4fa -> c98917f79 YARN-7090. testRMRestartAfterNodeLabelDisabled get failed when CapacityScheduler is configured. Contributed by Wangda Tan. (cherry picked from commit 652dd434d96cd1a1fe25cd8c636b1859c29f462b) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/c98917f7 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/c98917f7 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/c98917f7 Branch: refs/heads/branch-2 Commit: c98917f798a3de7535c8eb2ca99ef1630d460bb8 Parents: 8b2d5a4 Author: Junping Du Authored: Wed Aug 23 18:06:29 2017 -0700 Committer: Junping Du Committed: Wed Aug 23 18:07:07 2017 -0700 ---------------------------------------------------------------------- .../yarn/server/resourcemanager/TestRMRestart.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/c98917f7/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMRestart.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/TestRMRestart.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMRestart.java index 88562ca..0587cd8 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMRestart.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMRestart.java @@ -2438,6 +2438,22 @@ public class TestRMRestart extends ParameterizedSchedulerTestBase { @Test(timeout = 60000) public void testRMRestartAfterNodeLabelDisabled() throws Exception { + if (getSchedulerType() != SchedulerType.CAPACITY) { + return; + } + + // Initial FS node label store root dir to a random tmp dir + File nodeLabelFsStoreDir = new File("target", + this.getClass().getSimpleName() + + "-testRMRestartAfterNodeLabelDisabled"); + if (nodeLabelFsStoreDir.exists()) { + FileUtils.deleteDirectory(nodeLabelFsStoreDir); + } + nodeLabelFsStoreDir.deleteOnExit(); + String nodeLabelFsStoreDirURI = nodeLabelFsStoreDir.toURI().toString(); + conf.set(YarnConfiguration.FS_NODE_LABELS_STORE_ROOT_DIR, + nodeLabelFsStoreDirURI); + conf.setBoolean(YarnConfiguration.NODE_LABELS_ENABLED, true); MockRM rm1 = new MockRM( --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org For additional commands, e-mail: common-commits-help@hadoop.apache.org