YARN-7090. testRMRestartAfterNodeLabelDisabled get failed when CapacityScheduler is configured. Contributed by Wangda Tan.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/652dd434 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/652dd434 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/652dd434 Branch: refs/heads/YARN-5972 Commit: 652dd434d96cd1a1fe25cd8c636b1859c29f462b Parents: 1000a2a Author: Junping Du <[email protected]> Authored: Wed Aug 23 18:06:29 2017 -0700 Committer: Junping Du <[email protected]> Committed: Wed Aug 23 18:06:29 2017 -0700 ---------------------------------------------------------------------- .../yarn/server/resourcemanager/TestRMRestart.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/652dd434/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 3130ad1..4b4dffd 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 @@ -2504,6 +2504,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: [email protected] For additional commands, e-mail: [email protected]
