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 DDC03200BB6 for ; Fri, 4 Nov 2016 15:32:29 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id DC446160B04; Fri, 4 Nov 2016 14:32:29 +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 2E949160AE9 for ; Fri, 4 Nov 2016 15:32:29 +0100 (CET) Received: (qmail 16037 invoked by uid 500); 4 Nov 2016 14:32:28 -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 15858 invoked by uid 99); 4 Nov 2016 14:32:28 -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, 04 Nov 2016 14:32:28 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id AA856E0BC8; Fri, 4 Nov 2016 14:32:27 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: asuresh@apache.org To: common-commits@hadoop.apache.org Date: Fri, 04 Nov 2016 14:32:27 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [1/2] hadoop git commit: YARN-2995. Enhance UI to show cluster resource utilization of various container Execution types. (Konstantinos Karanasos via asuresh) archived-at: Fri, 04 Nov 2016 14:32:30 -0000 Repository: hadoop Updated Branches: refs/heads/trunk 19b3779ae -> 0aafc122d http://git-wip-us.apache.org/repos/asf/hadoop/blob/0aafc122/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesNodes.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/webapp/TestRMWebServicesNodes.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesNodes.java index 71f8950..3ff8f6a 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesNodes.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesNodes.java @@ -40,6 +40,7 @@ import org.apache.hadoop.yarn.api.records.Resource; import org.apache.hadoop.yarn.api.records.ResourceUtilization; import org.apache.hadoop.yarn.server.api.records.NodeHealthStatus; import org.apache.hadoop.yarn.server.api.records.NodeStatus; +import org.apache.hadoop.yarn.server.api.records.OpportunisticContainersStatus; import org.apache.hadoop.yarn.server.resourcemanager.MockRM; import org.apache.hadoop.yarn.server.resourcemanager.ResourceManager; import org.apache.hadoop.yarn.server.resourcemanager.rmnode.RMNode; @@ -722,13 +723,17 @@ public class TestRMWebServicesNodes extends JerseyTestBase { "aggregatedContainersPhysicalMemoryMB"), WebServicesTestUtils.getXmlInt(element, "aggregatedContainersVirtualMemoryMB"), - WebServicesTestUtils.getXmlFloat(element, "containersCPUUsage")); + WebServicesTestUtils.getXmlFloat(element, "containersCPUUsage"), + WebServicesTestUtils.getXmlInt(element, "numRunningOpportContainers"), + WebServicesTestUtils.getXmlLong(element, "usedMemoryOpport"), + WebServicesTestUtils.getXmlInt(element, "usedVirtualCoresOpport"), + WebServicesTestUtils.getXmlInt(element, "numQueuedContainers")); } } public void verifyNodeInfo(JSONObject nodeInfo, RMNode nm) throws JSONException, Exception { - assertEquals("incorrect number of elements", 14, nodeInfo.length()); + assertEquals("incorrect number of elements", 18, nodeInfo.length()); JSONObject resourceInfo = nodeInfo.getJSONObject("resourceUtilization"); verifyNodeInfoGeneric(nm, nodeInfo.getString("state"), @@ -745,21 +750,29 @@ public class TestRMWebServicesNodes extends JerseyTestBase { resourceInfo.getDouble("nodeCPUUsage"), resourceInfo.getInt("aggregatedContainersPhysicalMemoryMB"), resourceInfo.getInt("aggregatedContainersVirtualMemoryMB"), - resourceInfo.getDouble("containersCPUUsage")); + resourceInfo.getDouble("containersCPUUsage"), + nodeInfo.getInt("numRunningOpportContainers"), + nodeInfo.getLong("usedMemoryOpport"), + nodeInfo.getInt("usedVirtualCoresOpport"), + nodeInfo.getInt("numQueuedContainers")); } public void verifyNodeInfoGeneric(RMNode node, String state, String rack, String id, String nodeHostName, String nodeHTTPAddress, long lastHealthUpdate, String healthReport, - int numContainers, long usedMemoryMB, long availMemoryMB, long usedVirtualCores, - long availVirtualCores, String version, int nodePhysicalMemoryMB, - int nodeVirtualMemoryMB, double nodeCPUUsage, + int numContainers, long usedMemoryMB, long availMemoryMB, + long usedVirtualCores, long availVirtualCores, String version, + int nodePhysicalMemoryMB, int nodeVirtualMemoryMB, double nodeCPUUsage, int containersPhysicalMemoryMB, int containersVirtualMemoryMB, - double containersCPUUsage) + double containersCPUUsage, int numRunningOpportContainers, + long usedMemoryOpport, int usedVirtualCoresOpport, + int numQueuedContainers) throws JSONException, Exception { ResourceScheduler sched = rm.getResourceScheduler(); SchedulerNodeReport report = sched.getNodeReport(node.getNodeID()); + OpportunisticContainersStatus opportunisticStatus = + node.getOpportunisticContainersStatus(); WebServicesTestUtils.checkStringMatch("state", node.getState().toString(), state); @@ -807,6 +820,20 @@ public class TestRMWebServicesNodes extends JerseyTestBase { assertEquals("availVirtualCores doesn't match: " + availVirtualCores, report .getAvailableResource().getVirtualCores(), availVirtualCores); } + + if (opportunisticStatus != null) { + assertEquals("numRunningOpportContainers doesn't match: " + + numRunningOpportContainers, + opportunisticStatus.getRunningOpportContainers(), + numRunningOpportContainers); + assertEquals("usedMemoryOpport doesn't match: " + usedMemoryOpport, + opportunisticStatus.getOpportMemoryUsed(), usedMemoryOpport); + assertEquals( + "usedVirtualCoresOpport doesn't match: " + usedVirtualCoresOpport, + opportunisticStatus.getOpportCoresUsed(), usedVirtualCoresOpport); + assertEquals("numQueuedContainers doesn't match: " + numQueuedContainers, + opportunisticStatus.getQueuedOpportContainers(), numQueuedContainers); + } } } --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org For additional commands, e-mail: common-commits-help@hadoop.apache.org