Repository: hadoop Updated Branches: refs/heads/trunk 1db186f66 -> 66bba8c02
YARN-6249. TestFairSchedulerPreemption fails inconsistently. (Tao Jie via Yufei Gu) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/66bba8c0 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/66bba8c0 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/66bba8c0 Branch: refs/heads/trunk Commit: 66bba8c0244e5b17d496e2fa3999991705c11bc7 Parents: 1db186f Author: Yufei Gu <[email protected]> Authored: Fri May 19 14:53:27 2017 -0700 Committer: Yufei Gu <[email protected]> Committed: Fri May 19 14:53:27 2017 -0700 ---------------------------------------------------------------------- .../scheduler/fair/TestFairSchedulerPreemption.java | 4 ++++ 1 file changed, 4 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/66bba8c0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/TestFairSchedulerPreemption.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/scheduler/fair/TestFairSchedulerPreemption.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/TestFairSchedulerPreemption.java index 59d243b..3163024 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/TestFairSchedulerPreemption.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/TestFairSchedulerPreemption.java @@ -24,6 +24,7 @@ import org.apache.hadoop.yarn.server.resourcemanager.scheduler.event.NodeUpdateS import org.apache.hadoop.yarn.server.resourcemanager.rmcontainer.RMContainer; import org.apache.hadoop.yarn.server.resourcemanager.rmcontainer.RMContainerImpl; import org.apache.hadoop.yarn.util.ControlledClock; +import org.apache.hadoop.yarn.util.SystemClock; import org.junit.After; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -188,6 +189,9 @@ public class TestFairSchedulerPreemption extends FairSchedulerTestBase { private void setupCluster() throws IOException { resourceManager = new MockRM(conf); scheduler = (FairScheduler) resourceManager.getResourceScheduler(); + // YARN-6249, FSLeafQueue#lastTimeAtMinShare is initialized to the time in + // the real world, so we should keep the clock up with it. + clock.setTime(SystemClock.getInstance().getTime()); scheduler.setClock(clock); resourceManager.start(); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
