From 845cf8bc2868bd2c990b3b077caa24a0b7971211 Mon Sep 17 00:00:00 2001 From: slfan1989 <55643692+slfan1989@users.noreply.github.com> Date: Tue, 8 Nov 2022 02:13:23 +0800 Subject: [PATCH] YARN-11368. [Federation] Improve Yarn Router's Federation Page style. (#5105) --- .../webapps/static/federation/federation.js | 13 +++--- .../server/router/webapp/FederationBlock.java | 40 ++++++++++++++----- .../router/webapp/TestFederationWebApp.java | 13 ++++++ 3 files changed, 50 insertions(+), 16 deletions(-) diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/webapps/static/federation/federation.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/webapps/static/federation/federation.js index b3b1e9d392c..ac8e3efe11e 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/webapps/static/federation/federation.js +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/webapps/static/federation/federation.js @@ -28,7 +28,7 @@ $(document).ready(function() { var capabilityArr = scTableData.filter(item => (item.subcluster === row.id())); var capabilityObj = JSON.parse(capabilityArr[0].capability).clusterMetrics; row.child( - '' + + '
' + ' ' + '
' + '

Application Metrics

' + @@ -42,11 +42,12 @@ $(document).ready(function() { ' 		' + '

Resource Metrics

' + '

Memory

' + - ' TotalMB : ' + capabilityObj.totalMB + '

' + - ' ReservedMB : ' + capabilityObj.reservedMB + '

' + - ' AvailableMB : ' + capabilityObj.availableMB + '

' + - ' AllocatedMB : ' + capabilityObj.allocatedMB + '

' + - ' PendingMB : ' + capabilityObj.pendingMB + '

' + + ' Total Memory : ' + capabilityArr[0].totalmemory + '

' + + ' Reserved Memory : ' + capabilityArr[0].reservedmemory + '

' + + ' Available Memory : ' + capabilityArr[0].availablememory + '

' + + ' Allocated Memory : ' + capabilityArr[0].allocatedmemory + '

' + + ' Pending Memory : ' + capabilityArr[0].pendingmemory + '

' + + '
' + '

VirtualCores

' + ' TotalVirtualCores : ' + capabilityObj.totalVirtualCores + '

' + ' ReservedVirtualCores : ' + capabilityObj.reservedVirtualCores + '

' + diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/FederationBlock.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/FederationBlock.java index f80442714f3..44f8d7407bf 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/FederationBlock.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/FederationBlock.java @@ -23,12 +23,13 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.HashMap; +import java.util.Date; import com.google.gson.Gson; import org.apache.hadoop.util.StringUtils; -import org.apache.commons.lang3.time.DateFormatUtils; import org.apache.hadoop.yarn.server.federation.store.records.SubClusterId; import org.apache.hadoop.yarn.server.federation.store.records.SubClusterInfo; +import org.apache.hadoop.yarn.server.federation.store.records.SubClusterState; import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ClusterMetricsInfo; import org.apache.hadoop.yarn.server.router.Router; import org.apache.hadoop.yarn.webapp.hamlet2.Hamlet; @@ -149,32 +150,51 @@ class FederationBlock extends RouterBlock { ClusterMetricsInfo subClusterInfo = getClusterMetricsInfo(capability); // Prepare LastStartTime & LastHeartBeat - String lastStartTime = - DateFormatUtils.format(subcluster.getLastStartTime(), DATE_PATTERN); - String lastHeartBeat = - DateFormatUtils.format(subcluster.getLastHeartBeat(), DATE_PATTERN); + Date lastStartTime = new Date(subcluster.getLastStartTime()); + Date lastHeartBeat = new Date(subcluster.getLastHeartBeat()); // Prepare Resource long totalMB = subClusterInfo.getTotalMB(); String totalMBDesc = StringUtils.byteDesc(totalMB * BYTES_IN_MB); long totalVirtualCores = subClusterInfo.getTotalVirtualCores(); - String resources = String.format("", totalMBDesc, totalVirtualCores); + String resources = String.format("", totalMBDesc, totalVirtualCores); // Prepare Node long totalNodes = subClusterInfo.getTotalNodes(); long activeNodes = subClusterInfo.getActiveNodes(); - String nodes = String.format("", totalNodes, activeNodes); + String nodes = String.format("", totalNodes, activeNodes); // Prepare HTML Table + String stateStyle = "color:#dc3545;font-weight:bolder"; + SubClusterState state = subcluster.getState(); + if (SubClusterState.SC_RUNNING == state) { + stateStyle = "color:#28a745;font-weight:bolder"; + } + tbody.tr().$id(subClusterIdText) .td().$class("details-control").a(herfWebAppAddress, subClusterIdText).__() - .td(subcluster.getState().name()) - .td(lastStartTime) - .td(lastHeartBeat) + .td().$style(stateStyle).__(state.name()).__() + .td().__(lastStartTime).__() + .td().__(lastHeartBeat).__() .td(resources) .td(nodes) .__(); + // Formatted memory information + long allocatedMB = subClusterInfo.getAllocatedMB(); + String allocatedMBDesc = StringUtils.byteDesc(allocatedMB * BYTES_IN_MB); + long availableMB = subClusterInfo.getAvailableMB(); + String availableMBDesc = StringUtils.byteDesc(availableMB * BYTES_IN_MB); + long pendingMB = subClusterInfo.getPendingMB(); + String pendingMBDesc = StringUtils.byteDesc(pendingMB * BYTES_IN_MB); + long reservedMB = subClusterInfo.getReservedMB(); + String reservedMBDesc = StringUtils.byteDesc(reservedMB * BYTES_IN_MB); + + subclusterMap.put("totalmemory", totalMBDesc); + subclusterMap.put("allocatedmemory", allocatedMBDesc); + subclusterMap.put("availablememory", availableMBDesc); + subclusterMap.put("pendingmemory", pendingMBDesc); + subclusterMap.put("reservedmemory", reservedMBDesc); subclusterMap.put("subcluster", subClusterId.getId()); subclusterMap.put("capability", capability); lists.add(subclusterMap); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/webapp/TestFederationWebApp.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/webapp/TestFederationWebApp.java index 4ec482c615a..f1501fe1e7a 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/webapp/TestFederationWebApp.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/webapp/TestFederationWebApp.java @@ -23,14 +23,20 @@ import org.apache.hadoop.yarn.exceptions.YarnException; import org.apache.hadoop.yarn.server.router.Router; import org.apache.hadoop.yarn.webapp.test.WebAppTests; import org.junit.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.io.IOException; public class TestFederationWebApp extends TestRouterWebServicesREST { + private static final Logger LOG = + LoggerFactory.getLogger(TestFederationWebApp.class); + @Test public void testFederationWebViewNotEnable() throws InterruptedException, YarnException, IOException { + LOG.info("testFederationWebView - NotEnable Federation."); // Test Federation is not Enabled Configuration config = new YarnConfiguration(); config.setBoolean(YarnConfiguration.FEDERATION_ENABLED, false); @@ -40,6 +46,7 @@ public class TestFederationWebApp extends TestRouterWebServicesREST { @Test public void testFederationWebViewEnable() throws InterruptedException, YarnException, IOException { + LOG.info("testFederationWebView - Enable Federation."); // Test Federation Enabled Configuration config = new YarnConfiguration(); config.setBoolean(YarnConfiguration.FEDERATION_ENABLED, true); @@ -49,6 +56,7 @@ public class TestFederationWebApp extends TestRouterWebServicesREST { @Test public void testFederationAboutViewEnable() throws InterruptedException, YarnException, IOException { + LOG.info("testFederationAboutViewEnable - Enable Federation."); // Test Federation Enabled Configuration config = new YarnConfiguration(); config.setBoolean(YarnConfiguration.FEDERATION_ENABLED, true); @@ -58,6 +66,7 @@ public class TestFederationWebApp extends TestRouterWebServicesREST { @Test public void testFederationAboutViewNotEnable() throws InterruptedException, YarnException, IOException { + LOG.info("testFederationAboutViewNotEnable - NotEnable Federation."); // Test Federation Not Enabled Configuration config = new YarnConfiguration(); config.setBoolean(YarnConfiguration.FEDERATION_ENABLED, false); @@ -67,6 +76,7 @@ public class TestFederationWebApp extends TestRouterWebServicesREST { @Test public void testFederationNodeViewEnable() throws InterruptedException, YarnException, IOException { + LOG.info("testFederationNodeViewEnable - Enable Federation."); // Test Federation Enabled Configuration config = new YarnConfiguration(); config.setBoolean(YarnConfiguration.FEDERATION_ENABLED, true); @@ -76,6 +86,7 @@ public class TestFederationWebApp extends TestRouterWebServicesREST { @Test public void testFederationNodeViewNotEnable() throws InterruptedException, YarnException, IOException { + LOG.info("testFederationNodeViewNotEnable - NotEnable Federation."); // Test Federation Not Enabled Configuration config = new YarnConfiguration(); config.setBoolean(YarnConfiguration.FEDERATION_ENABLED, false); @@ -85,6 +96,7 @@ public class TestFederationWebApp extends TestRouterWebServicesREST { @Test public void testFederationAppViewEnable() throws InterruptedException, YarnException, IOException { + LOG.info("testFederationAppViewEnable - Enable Federation."); // Test Federation Enabled Configuration config = new YarnConfiguration(); config.setBoolean(YarnConfiguration.FEDERATION_ENABLED, true); @@ -94,6 +106,7 @@ public class TestFederationWebApp extends TestRouterWebServicesREST { @Test public void testFederationAppViewNotEnable() throws InterruptedException, YarnException, IOException { + LOG.info("testFederationAppViewNotEnable - NotEnable Federation."); // Test Federation Not Enabled Configuration config = new YarnConfiguration(); config.setBoolean(YarnConfiguration.FEDERATION_ENABLED, false);