Repository: hadoop Updated Branches: refs/heads/branch-2 b52928a6e -> fd7ba56f6
YARN-2717. Avoided duplicate logging when container logs are not found. Contributed by Xuan Gong. (cherry picked from commit 171f2376d23d51b61b9c9b3804ee86dbd4de033a) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/fd7ba56f Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/fd7ba56f Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/fd7ba56f Branch: refs/heads/branch-2 Commit: fd7ba56f6adec6c6ee7472b687f8c32f59109f84 Parents: b52928a Author: Zhijie Shen <[email protected]> Authored: Mon Oct 20 22:21:37 2014 -0700 Committer: Zhijie Shen <[email protected]> Committed: Mon Oct 20 22:23:12 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/fd7ba56f/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 04b7e1e..271444c 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 http://git-wip-us.apache.org/repos/asf/hadoop/blob/fd7ba56f/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; }
