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/CapacitySchedulerPage.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/CapacitySchedulerPage.java index ed2f64e..33f3b12 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/CapacitySchedulerPage.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/CapacitySchedulerPage.java @@ -162,8 +162,7 @@ private void renderQueueCapacityInfo(ResponseInfo ri, String label) { .__("Configured Capacity:", capacities.getConfiguredMinResource().toString()) .__("Configured Max Capacity:", - (capacities.getConfiguredMaxResource() == null - || capacities.getConfiguredMaxResource().getResource() + (capacities.getConfiguredMaxResource().getResource() .equals(Resources.none())) ? "unlimited" : capacities.getConfiguredMaxResource().toString()) 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/PartitionQueueCapacitiesInfo.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/PartitionQueueCapacitiesInfo.java index 2a15502..630252c 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/PartitionQueueCapacitiesInfo.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/PartitionQueueCapacitiesInfo.java @@ -37,7 +37,7 @@ private float maxCapacity = 100; private float absoluteCapacity; private float absoluteUsedCapacity; - private float absoluteMaxCapacity = 100; + private float absoluteMaxCapacity = 100; private float maxAMLimitPercentage; private ResourceInfo configuredMinResource; private ResourceInfo configuredMaxResource; @@ -45,6 +45,10 @@ private ResourceInfo effectiveMaxResource; public PartitionQueueCapacitiesInfo() { + this.configuredMinResource = new ResourceInfo(Resource.newInstance(0, 0)); + this.configuredMaxResource = new ResourceInfo(Resource.newInstance(0, 0)); + this.effectiveMinResource = new ResourceInfo(Resource.newInstance(0, 0)); + this.effectiveMaxResource = new ResourceInfo(Resource.newInstance(0, 0)); } public PartitionQueueCapacitiesInfo(String partitionName, float capacity, @@ -136,9 +140,6 @@ public ResourceInfo getConfiguredMinResource() { } public ResourceInfo getConfiguredMaxResource() { - if (configuredMaxResource.getResource().equals(Resources.none())) { - return null; - } return configuredMaxResource; }