Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

YARN-9563. Resource report REST API could return NaN or Inf (Ahmed Hussein via jeagles) 

Signed-off-by: Jonathan Eagles <jeagles@gmail.com>
(cherry picked from commit abf76ac371)
This commit is contained in:
Ahmed Hussein 2019-05-29 11:24:08 -05:00 committed by Jonathan Eagles
parent a9a3450560
commit 777f7345ef
3 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/SchedulerApplicationAttempt.java
View File

@ -1124,9 +1124,10 @@ public class SchedulerApplicationAttempt implements SchedulableEntity {
if (!calc.isInvalidDivisor(cluster)) { if (!calc.isInvalidDivisor(cluster)) {
float queueCapacityPerc = queue.getQueueInfo(false, false) float queueCapacityPerc = queue.getQueueInfo(false, false)
.getCapacity(); .getCapacity();
if (queueCapacityPerc != 0) { queueUsagePerc = calc.divide(cluster, usedResourceClone,
queueUsagePerc = calc.divide(cluster, usedResourceClone, Resources.multiply(cluster, queueCapacityPerc)) * 100;
Resources.multiply(cluster, queueCapacityPerc)) * 100; if (Float.isNaN(queueUsagePerc) || Float.isInfinite(queueUsagePerc)) {
queueUsagePerc = 0.0f;
} }
clusterUsagePerc = clusterUsagePerc =
calc.divide(cluster, usedResourceClone, cluster) * 100; calc.divide(cluster, usedResourceClone, cluster) * 100;

2
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/TestSchedulerApplicationAttempt.java
View File

@ -276,7 +276,7 @@ public class TestSchedulerApplicationAttempt {
assertEquals(60.0f, assertEquals(60.0f,
app.getResourceUsageReport().getClusterUsagePercentage(), 0.01f); app.getResourceUsageReport().getClusterUsagePercentage(), 0.01f);
queue = createQueue("test3", null, 0.0f); queue = createQueue("test3", null, Float.MIN_VALUE);
app = new SchedulerApplicationAttempt(appAttId, user, queue, app = new SchedulerApplicationAttempt(appAttId, user, queue,
queue.getAbstractUsersManager(), rmContext); queue.getAbstractUsersManager(), rmContext);

10
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestLeafQueue.java
View File

@ -4037,6 +4037,16 @@ public class TestLeafQueue {
0.01f); 0.01f);
assertEquals(15.0f, assertEquals(15.0f,
app.getResourceUsageReport().getClusterUsagePercentage(), 0.01f); app.getResourceUsageReport().getClusterUsagePercentage(), 0.01f);
// test that queueUsagePercentage returns neither NaN nor Infinite
AbstractCSQueue zeroQueue = createQueue("test2.2", null,
Float.MIN_VALUE, Float.MIN_VALUE,
Resources.multiply(res, Float.MIN_VALUE));
app = new FiCaSchedulerApp(appAttId, user, zeroQueue,
qChild.getAbstractUsersManager(), rmContext);
app.getAppAttemptResourceUsage().incUsed(requestedResource);
assertEquals(0.0f, app.getResourceUsageReport().getQueueUsagePercentage(),
0.01f);
} }
@Test @Test