From fd7ba56f6adec6c6ee7472b687f8c32f59109f84 Mon Sep 17 00:00:00 2001
From: Zhijie Shen <zjshen@apache.org>
Date: Mon, 20 Oct 2014 22:21:37 -0700
Subject: [PATCH] YARN-2717. Avoided duplicate logging when container logs are
 not found. Contributed by Xuan Gong.

(cherry picked from commit 171f2376d23d51b61b9c9b3804ee86dbd4de033a)
---
 hadoop-yarn-project/CHANGES.txt                                | 3 +++
 .../org/apache/hadoop/yarn/logaggregation/LogCLIHelpers.java   | 1 -
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 04b7e1e526c..271444cca89 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -672,6 +672,9 @@ Release 2.6.0 - UNRELEASED
     YARN-2701. Potential race condition in startLocalizer when using
     LinuxContainerExecutor. (Xuan Gong via jianhe)
 
+    YARN-2717. Avoided duplicate logging when container logs are not found. (Xuan
+    Gong via zjshen)
+
 Release 2.5.1 - 2014-09-05
 
   INCOMPATIBLE CHANGES
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/logaggregation/LogCLIHelpers.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/logaggregation/LogCLIHelpers.java
index 9efdef891d2..de06d483873 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/logaggregation/LogCLIHelpers.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/logaggregation/LogCLIHelpers.java
@@ -109,7 +109,6 @@ public int dumpAContainerLogs(String containerIdStr,
     }
 
     if (valueStream == null) {
-      containerLogNotFound(containerIdStr);
       return -1;
     }