YARN-3760. FSDataOutputStream leak in AggregatedLogFormat.LogWriter.close(). Contributed by Haibo Chen.
(cherry picked from commit c26ccf1adb3a72df3f68e1150b86b813c691203a) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/fd1ec752 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/fd1ec752 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/fd1ec752 Branch: refs/heads/HDFS-10467 Commit: fd1ec7523bcc93cf8be0e510aefd7f9ad7507b99 Parents: 550b896 Author: Junping Du <[email protected]> Authored: Wed Apr 12 09:34:34 2017 -0700 Committer: Inigo <[email protected]> Committed: Mon Apr 17 11:17:03 2017 -0700 ---------------------------------------------------------------------- .../hadoop/yarn/logaggregation/AggregatedLogFormat.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/fd1ec752/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/logaggregation/AggregatedLogFormat.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/logaggregation/AggregatedLogFormat.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/logaggregation/AggregatedLogFormat.java index 8d86967..0aa318c 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/logaggregation/AggregatedLogFormat.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/logaggregation/AggregatedLogFormat.java @@ -541,14 +541,15 @@ public class AggregatedLogFormat { @Override public void close() { - if (writer != null) { - try { + try { + if (writer != null) { writer.close(); - } catch (IOException e) { - LOG.warn("Exception closing writer", e); } + } catch (Exception e) { + LOG.warn("Exception closing writer", e); + } finally { + IOUtils.closeStream(this.fsDataOStream); } - IOUtils.closeStream(fsDataOStream); } } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
