You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by zj...@apache.org on 2014/10/21 07:22:21 UTC

git commit: YARN-2717. Avoided duplicate logging when container logs are not found. Contributed by Xuan Gong.

Repository: hadoop
Updated Branches:
  refs/heads/trunk 4a78a7522 -> 171f2376d


YARN-2717. Avoided duplicate logging when container logs are not found. Contributed by Xuan Gong.


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/171f2376
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/171f2376
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/171f2376

Branch: refs/heads/trunk
Commit: 171f2376d23d51b61b9c9b3804ee86dbd4de033a
Parents: 4a78a75
Author: Zhijie Shen <zj...@apache.org>
Authored: Mon Oct 20 22:21:37 2014 -0700
Committer: Zhijie Shen <zj...@apache.org>
Committed: Mon Oct 20 22:21:37 2014 -0700

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


http://git-wip-us.apache.org/repos/asf/hadoop/blob/171f2376/hadoop-yarn-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 08b7342..b130ecf 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -702,6 +702,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

http://git-wip-us.apache.org/repos/asf/hadoop/blob/171f2376/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/logaggregation/LogCLIHelpers.java
----------------------------------------------------------------------
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 9efdef8..de06d48 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 class LogCLIHelpers implements Configurable {
     }
 
     if (valueStream == null) {
-      containerLogNotFound(containerIdStr);
       return -1;
     }