YARN-4158. Remove duplicate close for LogWriter in AppLogAggregatorImpl#uploadLogsForContainers. Contributed by Zhihai Xu
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/8c1cdb17 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/8c1cdb17 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/8c1cdb17 Branch: refs/heads/HDFS-7966 Commit: 8c1cdb17a03fec91bfab172fe92b67bdeb9ebfba Parents: 62943b8 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:21:33 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/8c1cdb17/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index b4c5c5e..b2fb780 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -919,6 +919,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/8c1cdb17/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();
