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 5CA8F200C34 for ; Mon, 27 Feb 2017 16:15:04 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 5B6F6160B60; Mon, 27 Feb 2017 15:15:04 +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 827FF160B7A for ; Mon, 27 Feb 2017 16:15:03 +0100 (CET) Received: (qmail 10451 invoked by uid 500); 27 Feb 2017 15:14:58 -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 9902 invoked by uid 99); 27 Feb 2017 15:14:57 -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; Mon, 27 Feb 2017 15:14:57 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 6D8C2E00CC; Mon, 27 Feb 2017 15:14:57 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: stevel@apache.org To: common-commits@hadoop.apache.org Date: Mon, 27 Feb 2017 15:15:06 -0000 Message-Id: In-Reply-To: <73531d8e54bd44f8926c1e7e3d421fa1@git.apache.org> References: <73531d8e54bd44f8926c1e7e3d421fa1@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [10/31] hadoop git commit: YARN-6222. TestFairScheduler.testReservationMetrics is flaky. (Yufei Gu via kasha) archived-at: Mon, 27 Feb 2017 15:15:04 -0000 YARN-6222. TestFairScheduler.testReservationMetrics is flaky. (Yufei Gu via kasha) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/694e680d Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/694e680d Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/694e680d Branch: refs/heads/HADOOP-13345 Commit: 694e680d20dc07f634b539537021b09d9316601c Parents: 159d6c5 Author: Karthik Kambatla Authored: Thu Feb 23 15:21:52 2017 -0800 Committer: Karthik Kambatla Committed: Thu Feb 23 15:21:52 2017 -0800 ---------------------------------------------------------------------- .../yarn/server/resourcemanager/scheduler/fair/FSLeafQueue.java | 3 +-- .../server/resourcemanager/scheduler/fair/TestFairScheduler.java | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/694e680d/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FSLeafQueue.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FSLeafQueue.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FSLeafQueue.java index 59bde5b..d0e0961 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FSLeafQueue.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FSLeafQueue.java @@ -407,8 +407,7 @@ public class FSLeafQueue extends FSQueue { readLock.lock(); try { for (FSAppAttempt app : runnableApps) { - Resource pending = app.getAppAttemptResourceUsage().getPending(); - if (!Resources.isNone(pending) && + if (!Resources.isNone(app.getPendingDemand()) && (assignment || app.shouldCheckForStarvation())) { pendingForResourceApps.add(app); } http://git-wip-us.apache.org/repos/asf/hadoop/blob/694e680d/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/TestFairScheduler.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/TestFairScheduler.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/TestFairScheduler.java index 62430bf..31dd7fe 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/TestFairScheduler.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/TestFairScheduler.java @@ -5079,6 +5079,7 @@ public class TestFairScheduler extends FairSchedulerTestBase { scheduler.handle(updateEvent); createSchedulingRequestExistingApplication(1024, 1, 1, appAttemptId); + scheduler.update(); scheduler.handle(updateEvent); // no reservation yet --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org For additional commands, e-mail: common-commits-help@hadoop.apache.org