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 AFF7F2009DC for ; Tue, 2 May 2017 22:14:51 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id AE94B160BAB; Tue, 2 May 2017 20:14:51 +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 01B84160B9D for ; Tue, 2 May 2017 22:14:50 +0200 (CEST) Received: (qmail 38811 invoked by uid 500); 2 May 2017 20:14:50 -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 38802 invoked by uid 99); 2 May 2017 20:14:50 -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; Tue, 02 May 2017 20:14:50 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id F0512DFBC7; Tue, 2 May 2017 20:14:49 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: templedf@apache.org To: common-commits@hadoop.apache.org Message-Id: <1a3979133c9b4cce812921b0fd1c7a3e@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: hadoop git commit: YARN-6481. Yarn top shows negative container number in FS (Contributed by Tao Jie via Daniel Templeton) Date: Tue, 2 May 2017 20:14:49 +0000 (UTC) archived-at: Tue, 02 May 2017 20:14:51 -0000 Repository: hadoop Updated Branches: refs/heads/trunk b062b323b -> 9f0aea0ee YARN-6481. Yarn top shows negative container number in FS (Contributed by Tao Jie via Daniel Templeton) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/9f0aea0e Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/9f0aea0e Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/9f0aea0e Branch: refs/heads/trunk Commit: 9f0aea0ee2c680afd26ef9da6ac662be00d8e24f Parents: b062b32 Author: Daniel Templeton Authored: Tue May 2 13:04:40 2017 -0700 Committer: Daniel Templeton Committed: Tue May 2 13:06:47 2017 -0700 ---------------------------------------------------------------------- .../resourcemanager/scheduler/fair/FSQueue.java | 3 +++ .../scheduler/fair/TestFairScheduler.java | 15 +++++++++++++++ 2 files changed, 18 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/9f0aea0e/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FSQueue.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/FSQueue.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/FSQueue.java index acf4d5c..e131140 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/FSQueue.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/FSQueue.java @@ -253,6 +253,9 @@ public abstract class FSQueue implements Queue, Schedulable { stats.setAllocatedVCores(getMetrics().getAllocatedVirtualCores()); stats.setPendingVCores(getMetrics().getPendingVirtualCores()); stats.setReservedVCores(getMetrics().getReservedVirtualCores()); + stats.setAllocatedContainers(getMetrics().getAllocatedContainers()); + stats.setPendingContainers(getMetrics().getPendingContainers()); + stats.setReservedContainers(getMetrics().getReservedContainers()); return stats; } http://git-wip-us.apache.org/repos/asf/hadoop/blob/9f0aea0e/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 9bf79f6..2233287 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 @@ -874,6 +874,11 @@ public class TestFairScheduler extends FairSchedulerTestBase { QueueInfo queueInfo = scheduler.getQueueInfo("queueA", false, false); Assert.assertEquals(0.25f, queueInfo.getCapacity(), 0.0f); Assert.assertEquals(0.0f, queueInfo.getCurrentCapacity(), 0.0f); + // test queueMetrics + Assert.assertEquals(0, queueInfo.getQueueStatistics() + .getAllocatedContainers()); + Assert.assertEquals(0, queueInfo.getQueueStatistics() + .getAllocatedMemoryMB()); queueInfo = scheduler.getQueueInfo("queueB", false, false); Assert.assertEquals(0.75f, queueInfo.getCapacity(), 0.0f); Assert.assertEquals(0.0f, queueInfo.getCurrentCapacity(), 0.0f); @@ -889,9 +894,19 @@ public class TestFairScheduler extends FairSchedulerTestBase { queueInfo = scheduler.getQueueInfo("queueA", false, false); Assert.assertEquals(0.25f, queueInfo.getCapacity(), 0.0f); Assert.assertEquals(0.5f, queueInfo.getCurrentCapacity(), 0.0f); + // test queueMetrics + Assert.assertEquals(1, queueInfo.getQueueStatistics() + .getAllocatedContainers()); + Assert.assertEquals(1024, queueInfo.getQueueStatistics() + .getAllocatedMemoryMB()); queueInfo = scheduler.getQueueInfo("queueB", false, false); Assert.assertEquals(0.75f, queueInfo.getCapacity(), 0.0f); Assert.assertEquals(1.0f, queueInfo.getCurrentCapacity(), 0.0f); + // test queueMetrics + Assert.assertEquals(1, queueInfo.getQueueStatistics() + .getAllocatedContainers()); + Assert.assertEquals(6144, queueInfo.getQueueStatistics() + .getAllocatedMemoryMB()); } @Test --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org For additional commands, e-mail: common-commits-help@hadoop.apache.org