Repository: hadoop
Updated Branches:
  refs/heads/branch-2 22e719b16 -> 694b4abbc


YARN-5362. TestRMRestart#testFinishedAppRemovalAfterRMRestart can fail. 
Contributed by sandflee.

(cherry picked from commit d6d41e820ac7b3ba73f5e4ea1ee72715dc1ffc9f)


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

Branch: refs/heads/branch-2
Commit: 694b4abbc000d7cbf221a9e4393bc8ed6208300f
Parents: 22e719b
Author: Rohith Sharma K S <[email protected]>
Authored: Wed Jul 13 19:12:16 2016 +0530
Committer: Rohith Sharma K S <[email protected]>
Committed: Wed Jul 13 19:15:41 2016 +0530

----------------------------------------------------------------------
 .../apache/hadoop/yarn/server/resourcemanager/TestRMRestart.java    | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/694b4abb/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 dd82af5..9162258 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
@@ -1585,6 +1585,7 @@ public class TestRMRestart extends 
ParameterizedSchedulerTestBase {
     RMApp app1 = rm2.submitApp(200);
     MockAM am1 = launchAM(app1, rm2, nm1);
     finishApplicationMaster(app1, rm2, nm1, am1);
+    rm2.drainEvents();
 
     // the first app0 get kicked out from both rmContext and state store
     Assert.assertNull(rm2.getRMContext().getRMApps()


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to