YARN-7294. TestSignalContainer#testSignalRequestDeliveryToNM fails intermittently with Fair Scheduler. (Contributed by Miklos Szegedi)
(cherry picked from commit cbd2b73ef81a7e275c5d4f842cac5b81ff2f8c84) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/1000811b Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/1000811b Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/1000811b Branch: refs/heads/branch-2 Commit: 1000811bcba6a31eab189c640c39f4b22a3561a5 Parents: 2f476f4 Author: Yufei Gu <yu...@apache.org> Authored: Thu Oct 19 16:39:25 2017 -0700 Committer: vrushali <vrush...@apache.org> Committed: Fri Oct 20 11:22:28 2017 -0700 ---------------------------------------------------------------------- .../yarn/server/resourcemanager/TestSignalContainer.java | 8 ++++++++ 1 file changed, 8 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/1000811b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestSignalContainer.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/TestSignalContainer.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestSignalContainer.java index 2688987..fac0b96 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestSignalContainer.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestSignalContainer.java @@ -21,6 +21,7 @@ package org.apache.hadoop.yarn.server.resourcemanager; import java.util.ArrayList; import java.util.List; +import org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.FairScheduler; import org.junit.Assert; import org.apache.commons.logging.Log; @@ -50,6 +51,10 @@ public class TestSignalContainer { Logger rootLogger = LogManager.getRootLogger(); rootLogger.setLevel(Level.DEBUG); MockRM rm = new MockRM(); + FairScheduler fs = null; + if (rm.getResourceScheduler().getClass() == FairScheduler.class) { + fs = (FairScheduler)rm.getResourceScheduler(); + } rm.start(); MockNM nm1 = rm.registerNode("h1:1234", 5000); @@ -78,6 +83,9 @@ public class TestSignalContainer { List<Container> allocation = am.allocate(new ArrayList<ResourceRequest>(), new ArrayList<ContainerId>()).getAllocatedContainers(); conts.addAll(allocation); + if (fs != null) { + nm1.nodeHeartbeat(true); + } } Assert.assertEquals(request, conts.size()); --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
