diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/dao/ClusterMetricsInfo.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/dao/ClusterMetricsInfo.java index 69d88aacca7..4a65930b960 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/dao/ClusterMetricsInfo.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/dao/ClusterMetricsInfo.java @@ -99,9 +99,8 @@ public ClusterMetricsInfo(final ResourceScheduler rs) { if (rs instanceof CapacityScheduler) { CapacityScheduler cs = (CapacityScheduler) rs; - this.totalMB = availableMB + allocatedMB + reservedMB; - this.totalVirtualCores = - availableVirtualCores + allocatedVirtualCores + reservedVirtualCores; + this.totalMB = cs.getClusterResource().getMemorySize(); + this.totalVirtualCores = cs.getClusterResource().getVirtualCores(); // TODO, add support of other schedulers to get total used resources // across partition. if (cs.getRootQueue() != null @@ -113,8 +112,8 @@ public ClusterMetricsInfo(final ResourceScheduler rs) { cs.getClusterResource()); } } else { - this.totalMB = availableMB + allocatedMB; - this.totalVirtualCores = availableVirtualCores + allocatedVirtualCores; + this.totalMB = rs.getClusterResource().getMemorySize(); + this.totalVirtualCores = rs.getClusterResource().getVirtualCores(); } this.activeNodes = clusterMetrics.getNumActiveNMs(); this.lostNodes = clusterMetrics.getNumLostNMs();