Repository: hadoop Updated Branches: refs/heads/branch-2 3637bc8cd -> 0f47e4e74
YARN-2930. Fixed TestRMRestart#testRMRestartRecoveringNodeLabelManager intermittent failure. Contributed by Wangda Tan (cherry picked from commit 2ed90a57fdd31d194b4a690df68b158ed9743dba) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/0f47e4e7 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/0f47e4e7 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/0f47e4e7 Branch: refs/heads/branch-2 Commit: 0f47e4e74584f98cef894881b0395492c6f541f1 Parents: 3637bc8 Author: Jian He <jia...@apache.org> Authored: Tue Dec 9 16:47:24 2014 -0800 Committer: Jian He <jia...@apache.org> Committed: Tue Dec 9 16:48:46 2014 -0800 ---------------------------------------------------------------------- hadoop-yarn-project/CHANGES.txt | 3 +++ .../yarn/server/resourcemanager/TestRMRestart.java | 14 ++++++++++++++ 2 files changed, 17 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/0f47e4e7/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 8cdf40b..0a38d15 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -176,6 +176,9 @@ Release 2.7.0 - UNRELEASED YARN-2910. FSLeafQueue can throw ConcurrentModificationException. (Wilfred Spiegelenburg via kasha) + YARN-2930. Fixed TestRMRestart#testRMRestartRecoveringNodeLabelManager + intermittent failure. (Wangda Tan via jianhe) + Release 2.6.0 - 2014-11-18 INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/0f47e4e7/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 29f0208..fcb2be7 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 @@ -39,6 +39,7 @@ import java.util.List; import java.util.Map; import java.util.Set; +import org.apache.commons.io.FileUtils; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.CommonConfigurationKeysPublic; import org.apache.hadoop.io.DataOutputBuffer; @@ -2048,6 +2049,19 @@ public class TestRMRestart extends ParameterizedSchedulerTestBase { // 4. Get cluster and node lobel, it should be present by recovering it @Test(timeout = 20000) public void testRMRestartRecoveringNodeLabelManager() throws Exception { + // Initial FS node label store root dir to a random tmp dir + File nodeLabelFsStoreDir = + new File("target", this.getClass().getSimpleName() + + "-testRMRestartRecoveringNodeLabelManager"); + if (nodeLabelFsStoreDir.exists()) { + FileUtils.deleteDirectory(nodeLabelFsStoreDir); + } + nodeLabelFsStoreDir.deleteOnExit(); + + String nodeLabelFsStoreDirURI = nodeLabelFsStoreDir.toURI().toString(); + conf.set(YarnConfiguration.FS_NODE_LABELS_STORE_ROOT_DIR, + nodeLabelFsStoreDirURI); + MemoryRMStateStore memStore = new MemoryRMStateStore(); memStore.init(conf); MockRM rm1 = new MockRM(conf, memStore) {