Repository: hadoop Updated Branches: refs/heads/branch-2 a77ae7abd -> 223229b99
YARN-5349. TestWorkPreservingRMRestart#testUAMRecoveryOnRMWorkPreservingRestart fail intermittently. Contributed by Jason Lowe. (cherry picked from commit 8ce8672b6b551dacb9467924fc70f88790f5891f) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/223229b9 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/223229b9 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/223229b9 Branch: refs/heads/branch-2 Commit: 223229b99c2afccf3dc3edbef0794a9e7732f42d Parents: a77ae7a Author: Eric Payne <[email protected]> Authored: Wed Aug 2 12:53:22 2017 -0500 Committer: Eric Payne <[email protected]> Committed: Wed Aug 2 12:58:07 2017 -0500 ---------------------------------------------------------------------- .../resourcemanager/TestWorkPreservingRMRestart.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/223229b9/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestWorkPreservingRMRestart.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/TestWorkPreservingRMRestart.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestWorkPreservingRMRestart.java index d028227..2c37f44 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestWorkPreservingRMRestart.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestWorkPreservingRMRestart.java @@ -1324,11 +1324,11 @@ public class TestWorkPreservingRMRestart extends ParameterizedSchedulerTestBase nm1.nodeHeartbeat(true); List<Container> conts = am0.allocate(new ArrayList<ResourceRequest>(), new ArrayList<ContainerId>()).getAllocatedContainers(); - while (conts.size() == 0) { + while (conts.size() < 2) { nm1.nodeHeartbeat(true); conts.addAll(am0.allocate(new ArrayList<ResourceRequest>(), new ArrayList<ContainerId>()).getAllocatedContainers()); - Thread.sleep(500); + Thread.sleep(100); } // am failed,and relaunch it @@ -1426,14 +1426,12 @@ public class TestWorkPreservingRMRestart extends ParameterizedSchedulerTestBase nm1.nodeHeartbeat(true); List<Container> conts = am0.allocate(new ArrayList<ResourceRequest>(), new ArrayList<ContainerId>()).getAllocatedContainers(); - Assert.assertTrue(conts.isEmpty()); - while (conts.size() == 0) { + while (conts.size() < 2) { nm1.nodeHeartbeat(true); conts.addAll(am0.allocate(new ArrayList<ResourceRequest>(), new ArrayList<ContainerId>()).getAllocatedContainers()); - Thread.sleep(500); + Thread.sleep(100); } - Assert.assertFalse(conts.isEmpty()); // start new RM rm2 = new MockRM(conf, rm1.getRMStateStore()); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
