|
@@ -35,7 +35,6 @@ import java.util.concurrent.LinkedBlockingQueue;
|
|
|
import java.util.concurrent.atomic.AtomicBoolean;
|
|
|
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
-import org.apache.commons.lang3.time.DateUtils;
|
|
|
import org.apache.commons.logging.Log;
|
|
|
import org.apache.commons.logging.LogFactory;
|
|
|
import org.apache.hadoop.classification.InterfaceAudience.LimitedPrivate;
|
|
@@ -48,7 +47,6 @@ import org.apache.hadoop.util.Time;
|
|
|
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.ContainerExitStatus;
|
|
|
import org.apache.hadoop.yarn.api.records.ContainerId;
|
|
|
import org.apache.hadoop.yarn.api.records.ContainerStatus;
|
|
|
import org.apache.hadoop.yarn.api.records.ExecutionType;
|
|
@@ -2098,26 +2096,6 @@ public class CapacityScheduler extends
|
|
|
LeafQueue queue = (LeafQueue) application.getQueue();
|
|
|
queue.completedContainer(getClusterResource(), application, node,
|
|
|
rmContainer, containerStatus, event, null, true);
|
|
|
- if (ContainerExitStatus.PREEMPTED == containerStatus.getExitStatus()) {
|
|
|
- updateQueuePreemptionMetrics(queue, rmContainer);
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
- private void updateQueuePreemptionMetrics(
|
|
|
- CSQueue queue, RMContainer rmc) {
|
|
|
- QueueMetrics qMetrics = queue.getMetrics();
|
|
|
- final long usedMillis = rmc.getFinishTime() - rmc.getCreationTime();
|
|
|
- final long usedSeconds = usedMillis / DateUtils.MILLIS_PER_SECOND;
|
|
|
- Resource containerResource = rmc.getAllocatedResource();
|
|
|
- qMetrics.preemptContainer();
|
|
|
- long mbSeconds = (containerResource.getMemorySize() * usedMillis)
|
|
|
- / DateUtils.MILLIS_PER_SECOND;
|
|
|
- long vcSeconds = (containerResource.getVirtualCores() * usedMillis)
|
|
|
- / DateUtils.MILLIS_PER_SECOND;
|
|
|
- qMetrics.updatePreemptedMemoryMBSeconds(mbSeconds);
|
|
|
- qMetrics.updatePreemptedVcoreSeconds(vcSeconds);
|
|
|
- qMetrics.updatePreemptedSecondsForCustomResources(containerResource,
|
|
|
- usedSeconds);
|
|
|
}
|
|
|
|
|
|
@Lock(Lock.NoLock.class)
|