diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/container/ContainerImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/container/ContainerImpl.java index 8ad9784fc40..96bd7a8c83e 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/container/ContainerImpl.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/container/ContainerImpl.java @@ -1187,10 +1187,10 @@ public ContainerState transition(ContainerImpl container, if (container.recoveredStatus == RecoveredContainerStatus.COMPLETED) { container.sendFinishedEvents(); return ContainerState.DONE; - } else if (container.recoveredStatus == RecoveredContainerStatus.QUEUED) { - return ContainerState.SCHEDULED; - } else if (container.recoveredAsKilled && - container.recoveredStatus == RecoveredContainerStatus.REQUESTED) { + } else if (container.recoveredAsKilled && ( + container.recoveredStatus == RecoveredContainerStatus.REQUESTED + || container.recoveredStatus + == RecoveredContainerStatus.QUEUED)) { // container was killed but never launched container.metrics.killedContainer(); NMAuditLogger.logSuccess(container.user, @@ -1201,6 +1201,8 @@ public ContainerState transition(ContainerImpl container, container.containerTokenIdentifier.getResource()); container.sendFinishedEvents(); return ContainerState.DONE; + } else if (container.recoveredStatus == RecoveredContainerStatus.QUEUED) { + return ContainerState.SCHEDULED; } final ContainerLaunchContext ctxt = container.launchContext;