Repository: hadoop Updated Branches: refs/heads/branch-2 52f56524d -> 181bda042
YARN-4158. Remove duplicate close for LogWriter in AppLogAggregatorImpl#uploadLogsForContainers. Contributed by Zhihai Xu (cherry picked from commit 8c1cdb17a03fec91bfab172fe92b67bdeb9ebfba) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/181bda04 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/181bda04 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/181bda04 Branch: refs/heads/branch-2 Commit: 181bda0421d66a514baa61da63511f75e93e2ea4 Parents: 52f5652 Author: Jason Lowe <jl...@apache.org> Authored: Tue Sep 15 20:21:33 2015 +0000 Committer: Jason Lowe <jl...@apache.org> Committed: Tue Sep 15 20:22:23 2015 +0000 ---------------------------------------------------------------------- hadoop-yarn-project/CHANGES.txt | 3 +++ .../containermanager/logaggregation/AppLogAggregatorImpl.java | 1 + 2 files changed, 4 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/181bda04/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 127c3a9..4909b27 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -867,6 +867,9 @@ Release 2.7.2 - UNRELEASED YARN-4126. RM should not issue delegation tokens in unsecure mode. (Bibin A Chundatt via jianhe) + YARN-4158. Remove duplicate close for LogWriter in + AppLogAggregatorImpl#uploadLogsForContainers (Zhihai Xu via jlowe) + Release 2.7.1 - 2015-07-06 INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/181bda04/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/logaggregation/AppLogAggregatorImpl.java ---------------------------------------------------------------------- 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/logaggregation/AppLogAggregatorImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/logaggregation/AppLogAggregatorImpl.java index b2342c7..a573549 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/logaggregation/AppLogAggregatorImpl.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/logaggregation/AppLogAggregatorImpl.java @@ -359,6 +359,7 @@ public class AppLogAggregatorImpl implements AppLogAggregator { if (writer != null) { writer.close(); + writer = null; } long currentTime = System.currentTimeMillis();