From c98917f798a3de7535c8eb2ca99ef1630d460bb8 Mon Sep 17 00:00:00 2001 From: Junping Du Date: Wed, 23 Aug 2017 18:06:29 -0700 Subject: [PATCH] YARN-7090. testRMRestartAfterNodeLabelDisabled get failed when CapacityScheduler is configured. Contributed by Wangda Tan. (cherry picked from commit 652dd434d96cd1a1fe25cd8c636b1859c29f462b) --- .../server/resourcemanager/TestRMRestart.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) 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 88562caf549..0587cd88be4 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 @@ private MockAM launchAndFailAM(RMApp app, MockRM rm, MockNM nm) @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(