Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 69C63200C89 for ; Sat, 20 May 2017 00:27:47 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 6826D160BD2; Fri, 19 May 2017 22:27:47 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id AE4F2160BD1 for ; Sat, 20 May 2017 00:27:46 +0200 (CEST) Received: (qmail 64371 invoked by uid 500); 19 May 2017 22:27:45 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 64358 invoked by uid 99); 19 May 2017 22:27:44 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 19 May 2017 22:27:44 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id B8DC4DFA33; Fri, 19 May 2017 22:27:44 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: yufei@apache.org To: common-commits@hadoop.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: hadoop git commit: YARN-6249. TestFairSchedulerPreemption fails inconsistently. (Tao Jie via Yufei Gu) Date: Fri, 19 May 2017 22:27:44 +0000 (UTC) archived-at: Fri, 19 May 2017 22:27:47 -0000 Repository: hadoop Updated Branches: refs/heads/branch-2 46c54bf20 -> 50e263a31 YARN-6249. TestFairSchedulerPreemption fails inconsistently. (Tao Jie via Yufei Gu) (cherry picked from commit 66bba8c0244e5b17d496e2fa3999991705c11bc7) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/50e263a3 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/50e263a3 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/50e263a3 Branch: refs/heads/branch-2 Commit: 50e263a3162292e27f45ecbbfd3c6d89445ae08e Parents: 46c54bf Author: Yufei Gu Authored: Fri May 19 14:53:27 2017 -0700 Committer: Yufei Gu Committed: Fri May 19 15:22:14 2017 -0700 ---------------------------------------------------------------------- .../scheduler/fair/TestFairSchedulerPreemption.java | 4 ++++ 1 file changed, 4 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/50e263a3/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: common-commits-unsubscribe@hadoop.apache.org For additional commands, e-mail: common-commits-help@hadoop.apache.org