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/AbstractYarnScheduler.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/AbstractYarnScheduler.java
index 8772ddb44e6b3..0fa10e03c032c 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/AbstractYarnScheduler.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/AbstractYarnScheduler.java
@@ -506,6 +506,7 @@ public void setEntitlement(String queue, QueueEntitlement entitlement)
   private void killOrphanContainerOnNode(RMNode node,
       NMContainerStatus container) {
     if (!container.getContainerState().equals(ContainerState.COMPLETE)) {
+      LOG.warn("Killing container " + container + " for unknown application");
       this.rmContext.getDispatcher().getEventHandler().handle(
         new RMNodeCleanContainerEvent(node.getNodeID(),
           container.getContainerId()));
@@ -528,17 +529,12 @@ public void recoverContainersOnNode(List<NMContainerStatus> containerReports,
                 .getApplicationId();
         RMApp rmApp = rmContext.getRMApps().get(appId);
         if (rmApp == null) {
-          LOG.error("Skip recovering container " + container
-              + " for unknown application.");
           killOrphanContainerOnNode(nm, container);
           continue;
         }
 
         SchedulerApplication<T> schedulerApp = applications.get(appId);
         if (schedulerApp == null) {
-          LOG.info("Skip recovering container  " + container
-              + " for unknown SchedulerApplication. "
-              + "Application current state is " + rmApp.getState());
           killOrphanContainerOnNode(nm, container);
           continue;
         }