YARN-3760. FSDataOutputStream leak in AggregatedLogFormat.LogWriter.close(). Contributed by Haibo Chen.

(cherry picked from commit c26ccf1adb3a72df3f68e1150b86b813c691203a)
(cherry picked from commit 9d9087a67a)
This commit is contained in:
Junping Du 2017-04-12 09:34:34 -07:00
parent 8ed230c805
commit d77cada182
1 changed files with 6 additions and 5 deletions

View File

@ -540,14 +540,15 @@ public class AggregatedLogFormat {
@Override @Override
public void close() { public void close() {
if (writer != null) { try {
try { if (writer != null) {
writer.close(); 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);
} }
} }