YARN-11653. Add Totoal_Memory and Total_Vcores columns in Nodes page (#6501) Contributed by Jiandan Yang.

Signed-off-by: Shilun Fan <slfan1989@apache.org>

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/NodesPage.java

@@ -88,18 +88,22 @@ class NodesPage extends RmView {
             .th(".allocationTags", "Allocation Tags")
             .th(".mem", "Mem Used")
             .th(".mem", "Mem Avail")
+            .th(".mem", "Mem Total")
             .th(".mem", "Phys Mem Used %")
             .th(".vcores", "VCores Used")
             .th(".vcores", "VCores Avail")
+            .th(".vcores", "VCores Total")
             .th(".vcores", "Phys VCores Used %");
       } else {
         trbody.th(".containers", "Running Containers (G)")
             .th(".allocationTags", "Allocation Tags")
             .th(".mem", "Mem Used (G)")
             .th(".mem", "Mem Avail (G)")
+            .th(".mem", "Mem Total")
             .th(".mem", "Phys Mem Used %")
             .th(".vcores", "VCores Used (G)")
             .th(".vcores", "VCores Avail (G)")
+            .th(".vcores", "VCores Total")
             .th(".vcores", "Phys VCores Used %")
             .th(".containers", "Running Containers (O)")
             .th(".mem", "Mem Used (O)")
@@ -175,6 +179,8 @@ class NodesPage extends RmView {
         NodeInfo info = new NodeInfo(ni, sched);
         int usedMemory = (int) info.getUsedMemory();
         int availableMemory = (int) info.getAvailableMemory();
+        long totalMemory = info.getTotalResource().getMemorySize();
+        int totalVcore = info.getTotalResource().getvCores();
         nodeTableData.append("[\"")
             .append(StringUtils.join(",", info.getNodeLabels())).append("\",\"")
             .append(info.getRack()).append("\",\"").append(info.getState())
@@ -198,6 +204,8 @@ class NodesPage extends RmView {
             .append("\",\"").append("<br title='")
             .append(String.valueOf(availableMemory)).append("'>")
             .append(StringUtils.byteDesc(availableMemory * BYTES_IN_MB))
+            .append("\",\"").append("<br title='").append(String.valueOf(totalMemory))
+            .append("'>").append(StringUtils.byteDesc(totalMemory * BYTES_IN_MB))
             .append("\",\"")
             .append(String.valueOf((int) info.getMemUtilization()))
             .append("\",\"")
@@ -205,6 +213,8 @@ class NodesPage extends RmView {
             .append("\",\"")
             .append(String.valueOf(info.getAvailableVirtualCores()))
             .append("\",\"")
+            .append(String.valueOf(totalVcore))
+            .append("\",\"")
             .append(String.valueOf((int) info.getVcoreUtilization()))
             .append("\",\"");
 

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestNodesPage.java

@@ -52,7 +52,7 @@ public class TestNodesPage {
   // Number of Actual Table Headers for NodesPage.NodesBlock might change in
   // future. In that case this value should be adjusted to the new value.
   private final int numberOfThInMetricsTable = 25;
-  private final int numberOfActualTableHeaders = 16;
+  private final int numberOfActualTableHeaders = 18;
   private final int numberOfThForOpportunisticContainers = 4;
 
   private Injector injector;