From 87c6f5094be9de6f60376d0defdbebb3ad8cd92b Mon Sep 17 00:00:00 2001 From: Sunil G Date: Thu, 4 Jan 2018 18:39:20 +0530 Subject: [PATCH] YARN-7699 --- .../resourcemanager/scheduler/common/fica/FiCaSchedulerApp.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/common/fica/FiCaSchedulerApp.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/common/fica/FiCaSchedulerApp.java index 776a7e98af2..d82a258e428 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/common/fica/FiCaSchedulerApp.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/common/fica/FiCaSchedulerApp.java @@ -1011,11 +1011,14 @@ public ApplicationResourceUsageReport getResourceUsageReport() { getAppAMNodePartitionName(), cluster); ResourceCalculator calc = rmContext.getScheduler().getResourceCalculator(); + float queueUsagePerc = 0.0f; if (!calc.isInvalidDivisor(totalPartitionRes)) { Resource effCap = ((AbstractCSQueue) getQueue()) .getEffectiveCapacity(getAppAMNodePartitionName()); - float queueUsagePerc = calc.divide(totalPartitionRes, - report.getUsedResources(), effCap) * 100; + if (!effCap.equals(Resources.none())) { + queueUsagePerc = calc.divide(totalPartitionRes, + report.getUsedResources(), effCap) * 100; + } report.setQueueUsagePercentage(queueUsagePerc); } return report; -- 2.14.3 (Apple Git-98)