YARN-4315. NaN in Queue percentage for cluster apps page. (Bibin A Chundatt via wangda)
This commit is contained in:
parent
99cf2ecee9
commit
561abb9fee
|
@ -1248,6 +1248,8 @@ Release 2.7.3 - UNRELEASED
|
|||
YARN-4452. NPE when submit Unmanaged application. (Naganarasimha G R via
|
||||
junping_du)
|
||||
|
||||
YARN-4315. NaN in Queue percentage for cluster apps page. (Bibin A Chundatt via wangda)
|
||||
|
||||
Release 2.7.2 - UNRELEASED
|
||||
|
||||
INCOMPATIBLE CHANGES
|
||||
|
|
|
@ -694,17 +694,20 @@ public class SchedulerApplicationAttempt implements SchedulableEntity {
|
|||
Resources.clone(attemptResourceUsage.getReserved());
|
||||
Resource cluster = rmContext.getScheduler().getClusterResource();
|
||||
ResourceCalculator calc = rmContext.getScheduler().getResourceCalculator();
|
||||
float queueUsagePerc = calc.divide(cluster, usedResourceClone, Resources
|
||||
.multiply(cluster, queue.getQueueInfo(false, false).getCapacity()))
|
||||
* 100;
|
||||
float clusterUsagePerc =
|
||||
calc.divide(cluster, usedResourceClone, cluster) * 100;
|
||||
float queueUsagePerc = 0.0f;
|
||||
float clusterUsagePerc = 0.0f;
|
||||
if (!calc.isInvalidDivisor(cluster)) {
|
||||
queueUsagePerc =
|
||||
calc.divide(cluster, usedResourceClone, Resources.multiply(cluster,
|
||||
queue.getQueueInfo(false, false).getCapacity())) * 100;
|
||||
clusterUsagePerc = calc.divide(cluster, usedResourceClone, cluster) * 100;
|
||||
}
|
||||
return ApplicationResourceUsageReport.newInstance(liveContainers.size(),
|
||||
reservedContainers.size(), usedResourceClone, reservedResourceClone,
|
||||
Resources.add(usedResourceClone, reservedResourceClone),
|
||||
runningResourceUsage.getMemorySeconds(),
|
||||
runningResourceUsage.getVcoreSeconds(),
|
||||
queueUsagePerc, clusterUsagePerc);
|
||||
runningResourceUsage.getVcoreSeconds(), queueUsagePerc,
|
||||
clusterUsagePerc);
|
||||
}
|
||||
|
||||
public synchronized Map<ContainerId, RMContainer> getLiveContainersMap() {
|
||||
|
|
|
@ -17,10 +17,9 @@
|
|||
*/
|
||||
package org.apache.hadoop.yarn.server.resourcemanager.scheduler;
|
||||
|
||||
import org.apache.hadoop.yarn.api.records.*;
|
||||
import org.apache.hadoop.yarn.server.resourcemanager.RMContext;
|
||||
import static org.junit.Assert.assertEquals;
|
||||
import static org.mockito.Mockito.*;
|
||||
import static org.mockito.Mockito.mock;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
import java.util.Arrays;
|
||||
import java.util.HashMap;
|
||||
|
@ -28,6 +27,17 @@ import java.util.Map;
|
|||
|
||||
import org.apache.hadoop.conf.Configuration;
|
||||
import org.apache.hadoop.metrics2.lib.DefaultMetricsSystem;
|
||||
import org.apache.hadoop.yarn.api.records.ApplicationAttemptId;
|
||||
import org.apache.hadoop.yarn.api.records.ApplicationId;
|
||||
import org.apache.hadoop.yarn.api.records.Container;
|
||||
import org.apache.hadoop.yarn.api.records.ContainerId;
|
||||
import org.apache.hadoop.yarn.api.records.NodeId;
|
||||
import org.apache.hadoop.yarn.api.records.Priority;
|
||||
import org.apache.hadoop.yarn.api.records.QueueInfo;
|
||||
import org.apache.hadoop.yarn.api.records.QueueState;
|
||||
import org.apache.hadoop.yarn.api.records.Resource;
|
||||
import org.apache.hadoop.yarn.api.records.ResourceRequest;
|
||||
import org.apache.hadoop.yarn.server.resourcemanager.RMContext;
|
||||
import org.apache.hadoop.yarn.server.resourcemanager.rmcontainer.RMContainer;
|
||||
import org.apache.hadoop.yarn.server.resourcemanager.scheduler.fifo.FifoScheduler;
|
||||
import org.apache.hadoop.yarn.util.resource.DefaultResourceCalculator;
|
||||
|
@ -212,4 +222,31 @@ public class TestSchedulerApplicationAttempt {
|
|||
assertEquals(60.0f,
|
||||
app.getResourceUsageReport().getClusterUsagePercentage(), 0.01f);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testAppPercentagesOnswitch() throws Exception {
|
||||
FifoScheduler scheduler = mock(FifoScheduler.class);
|
||||
when(scheduler.getClusterResource()).thenReturn(Resource.newInstance(0, 0));
|
||||
when(scheduler.getResourceCalculator())
|
||||
.thenReturn(new DefaultResourceCalculator());
|
||||
|
||||
ApplicationAttemptId appAttId = createAppAttemptId(0, 0);
|
||||
RMContext rmContext = mock(RMContext.class);
|
||||
when(rmContext.getEpoch()).thenReturn(3L);
|
||||
when(rmContext.getScheduler()).thenReturn(scheduler);
|
||||
|
||||
final String user = "user1";
|
||||
Queue queue = createQueue("test", null);
|
||||
SchedulerApplicationAttempt app = new SchedulerApplicationAttempt(appAttId,
|
||||
user, queue, queue.getActiveUsersManager(), rmContext);
|
||||
|
||||
// Resource request
|
||||
Resource requestedResource = Resource.newInstance(1536, 2);
|
||||
app.attemptResourceUsage.incUsed(requestedResource);
|
||||
|
||||
assertEquals(0.0f, app.getResourceUsageReport().getQueueUsagePercentage(),
|
||||
0.0f);
|
||||
assertEquals(0.0f, app.getResourceUsageReport().getClusterUsagePercentage(),
|
||||
0.0f);
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue