From 2939f85b0534d1970c2aedd8fa33ee010c46344e Mon Sep 17 00:00:00 2001 From: Prabhu Joseph Date: Fri, 24 May 2019 01:31:16 +0530 Subject: [PATCH] YARN-8625 --- .../webapp/TestAHSWebServices.java | 3 +++ .../org/apache/hadoop/yarn/server/webapp/dao/AppInfo.java | 15 +++++++++++++++ 2 files changed, 18 insertions(+) diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/TestAHSWebServices.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/TestAHSWebServices.java index f96fad8..1403246 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/TestAHSWebServices.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/TestAHSWebServices.java @@ -19,6 +19,7 @@ package org.apache.hadoop.yarn.server.applicationhistoryservice.webapp; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; import static org.junit.Assert.fail; import java.util.Arrays; @@ -320,6 +321,8 @@ public void testSingleApp() throws Exception { assertEquals(FinalApplicationStatus.UNDEFINED.toString(), app.get("finalAppStatus")); assertEquals(YarnApplicationState.FINISHED.toString(), app.get("appState")); + assertNotNull("Aggregate resource allocation is null", + app.get("aggregateResourceAllocation")); } @Test diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/dao/AppInfo.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/dao/AppInfo.java index de14e03..4981672 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/dao/AppInfo.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/dao/AppInfo.java @@ -57,6 +57,7 @@ protected long finishedTime; protected long elapsedTime; protected String applicationTags; + private String aggregateResourceAllocation; public AppInfo() { // JAXB needs this @@ -82,6 +83,15 @@ public AppInfo(ApplicationReport app) { finishedTime = app.getFinishTime(); elapsedTime = Times.elapsed(startedTime, finishedTime); finalAppStatus = app.getFinalApplicationStatus(); + + if (app.getApplicationResourceUsageReport() != null) { + Long memorySeconds = app.getApplicationResourceUsageReport(). + getMemorySeconds(); + Long vcoreSeconds = app.getApplicationResourceUsageReport(). + getVcoreSeconds(); + aggregateResourceAllocation = memorySeconds + " MB-seconds, " + + vcoreSeconds + " vcore-seconds"; + } progress = app.getProgress() * 100; // in percent if (app.getApplicationTags() != null && !app.getApplicationTags().isEmpty()) { this.applicationTags = CSV_JOINER.join(app.getApplicationTags()); @@ -163,4 +173,9 @@ public long getElapsedTime() { public String getApplicationTags() { return applicationTags; } + + public String getAggregateResourceAllocation() { + return aggregateResourceAllocation; + } + } -- 2.7.4 (Apple Git-66)