YARN-5462. TestNodeStatusUpdater.testNodeStatusUpdaterRetryAndNMShutdown fails intermittently. Contributed by Eric Badger
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/db646540 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/db646540 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/db646540 Branch: refs/heads/YARN-2915 Commit: db646540f094077941b56ed681a4f3e5853f5b7f Parents: 4d92aef Author: Jason Lowe <jl...@apache.org> Authored: Wed Aug 3 19:17:25 2016 +0000 Committer: Jason Lowe <jl...@apache.org> Committed: Wed Aug 3 19:17:25 2016 +0000 ---------------------------------------------------------------------- .../hadoop/yarn/server/nodemanager/TestNodeStatusUpdater.java | 5 +++++ 1 file changed, 5 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/db646540/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestNodeStatusUpdater.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestNodeStatusUpdater.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestNodeStatusUpdater.java index e7d18b7..c71b1e6 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestNodeStatusUpdater.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestNodeStatusUpdater.java @@ -561,6 +561,8 @@ public class TestNodeStatusUpdater { @Override protected void serviceStop() throws Exception { + // Make sure that all containers are started before starting shutdown + syncBarrier.await(10000, TimeUnit.MILLISECONDS); System.out.println("Called stooppppp"); super.serviceStop(); isStopped = true; @@ -1757,6 +1759,9 @@ public class TestNodeStatusUpdater { new File("start_file.txt"), port); try { + // Wait until we start stopping + syncBarrier.await(10000, TimeUnit.MILLISECONDS); + // Wait until we finish stopping syncBarrier.await(10000, TimeUnit.MILLISECONDS); } catch (Exception e) { } --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
