You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ep...@apache.org on 2017/08/02 17:54:22 UTC

hadoop git commit: YARN-5349. TestWorkPreservingRMRestart#testUAMRecoveryOnRMWorkPreservingRestart fail intermittently. Contributed by Jason Lowe.

Repository: hadoop
Updated Branches:
  refs/heads/trunk 45535f8af -> 8ce8672b6


YARN-5349. TestWorkPreservingRMRestart#testUAMRecoveryOnRMWorkPreservingRestart fail intermittently. Contributed by Jason Lowe.


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/8ce8672b
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/8ce8672b
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/8ce8672b

Branch: refs/heads/trunk
Commit: 8ce8672b6b551dacb9467924fc70f88790f5891f
Parents: 45535f8
Author: Eric Payne <ep...@apache.org>
Authored: Wed Aug 2 12:53:22 2017 -0500
Committer: Eric Payne <ep...@apache.org>
Committed: Wed Aug 2 12:53:22 2017 -0500

----------------------------------------------------------------------
 .../resourcemanager/TestWorkPreservingRMRestart.java      | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/8ce8672b/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: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org