YARN-4624. NPE in PartitionQueueCapacitiesInfo while accessing Schduler UI. Contributed by Brahma Reddy Battula

(cherry picked from commit d81b8163b4)
(cherry picked from commit 991823482f)
This commit is contained in:
Naganarasimha 2016-08-06 01:13:36 +05:30
parent e7863da095
commit e6a994badf
2 changed files with 4 additions and 4 deletions

View File

@ -35,14 +35,14 @@ public class PartitionQueueCapacitiesInfo {
private float absoluteCapacity; private float absoluteCapacity;
private float absoluteUsedCapacity; private float absoluteUsedCapacity;
private float absoluteMaxCapacity = 100; private float absoluteMaxCapacity = 100;
private Float maxAMLimitPercentage; private float maxAMLimitPercentage;
public PartitionQueueCapacitiesInfo() { public PartitionQueueCapacitiesInfo() {
} }
public PartitionQueueCapacitiesInfo(String partitionName, float capacity, public PartitionQueueCapacitiesInfo(String partitionName, float capacity,
float usedCapacity, float maxCapacity, float absCapacity, float usedCapacity, float maxCapacity, float absCapacity,
float absUsedCapacity, float absMaxCapacity, Float maxAMLimitPercentage) { float absUsedCapacity, float absMaxCapacity, float maxAMLimitPercentage) {
super(); super();
this.partitionName = partitionName; this.partitionName = partitionName;
this.capacity = capacity; this.capacity = capacity;

View File

@ -49,7 +49,7 @@ public QueueCapacitiesInfo(QueueCapacities capacities,
float absCapacity; float absCapacity;
float absUsedCapacity; float absUsedCapacity;
float absMaxCapacity; float absMaxCapacity;
Float maxAMLimitPercentage; float maxAMLimitPercentage;
for (String partitionName : capacities.getExistingNodeLabels()) { for (String partitionName : capacities.getExistingNodeLabels()) {
usedCapacity = capacities.getUsedCapacity(partitionName) * 100; usedCapacity = capacities.getUsedCapacity(partitionName) * 100;
capacity = capacities.getCapacity(partitionName) * 100; capacity = capacities.getCapacity(partitionName) * 100;
@ -68,7 +68,7 @@ public QueueCapacitiesInfo(QueueCapacities capacities,
queueCapacitiesByPartition.add(new PartitionQueueCapacitiesInfo( queueCapacitiesByPartition.add(new PartitionQueueCapacitiesInfo(
partitionName, capacity, usedCapacity, maxCapacity, absCapacity, partitionName, capacity, usedCapacity, maxCapacity, absCapacity,
absUsedCapacity, absMaxCapacity, absUsedCapacity, absMaxCapacity,
considerAMUsage ? maxAMLimitPercentage : null)); considerAMUsage ? maxAMLimitPercentage : 0f));
} }
} }