Repository: hadoop Updated Branches: refs/heads/branch-2.7 ca6d5b4b9 -> 30ebb792f
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/30ebb792 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/30ebb792 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/30ebb792 Branch: refs/heads/branch-2.7 Commit: 30ebb792f927beeb92c7b5e6cdf1debbba2cead7 Parents: ca6d5b4 Author: Jason Lowe <[email protected]> Authored: Tue Sep 15 20:21:33 2015 +0000 Committer: Jason Lowe <[email protected]> Committed: Tue Sep 15 20:23:11 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/30ebb792/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 0dcb628..a40d0a4 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -73,6 +73,9 @@ Release 2.7.2 - UNRELEASED YARN-4153. TestAsyncDispatcher failed at branch-2.7 (Zhihai Xu 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/30ebb792/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 c7ca666..0de4288 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 @@ -290,6 +290,7 @@ public class AppLogAggregatorImpl implements AppLogAggregator { if (writer != null) { writer.close(); + writer = null; } final Path renamedPath = this.rollingMonitorInterval <= 0
