HDFS-12789. [READ] Image generation tool does not close an opened stream
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/94a7b681 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/94a7b681 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/94a7b681 Branch: refs/heads/HDFS-9806 Commit: 94a7b68187e4bad9eb004dccdf051af711099f59 Parents: 7887501 Author: Virajith Jalaparti <[email protected]> Authored: Wed Nov 8 10:28:50 2017 -0800 Committer: Virajith Jalaparti <[email protected]> Committed: Fri Dec 15 10:18:28 2017 -0800 ---------------------------------------------------------------------- .../hadoop/hdfs/server/namenode/ImageWriter.java | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/94a7b681/hadoop-tools/hadoop-fs2img/src/main/java/org/apache/hadoop/hdfs/server/namenode/ImageWriter.java ---------------------------------------------------------------------- diff --git a/hadoop-tools/hadoop-fs2img/src/main/java/org/apache/hadoop/hdfs/server/namenode/ImageWriter.java b/hadoop-tools/hadoop-fs2img/src/main/java/org/apache/hadoop/hdfs/server/namenode/ImageWriter.java index ea1888a..390bb39 100644 --- a/hadoop-tools/hadoop-fs2img/src/main/java/org/apache/hadoop/hdfs/server/namenode/ImageWriter.java +++ b/hadoop-tools/hadoop-fs2img/src/main/java/org/apache/hadoop/hdfs/server/namenode/ImageWriter.java @@ -165,16 +165,23 @@ public class ImageWriter implements Closeable { // create directory and inode sections as side-files. // The details are written to files to avoid keeping them in memory. - dirsTmp = File.createTempFile("fsimg_dir", null); - dirsTmp.deleteOnExit(); - dirs = beginSection(new FileOutputStream(dirsTmp)); + FileOutputStream dirsTmpStream = null; + try { + dirsTmp = File.createTempFile("fsimg_dir", null); + dirsTmp.deleteOnExit(); + dirsTmpStream = new FileOutputStream(dirsTmp); + dirs = beginSection(dirsTmpStream); + } catch (IOException e) { + IOUtils.cleanupWithLogger(null, raw, dirsTmpStream); + throw e; + } + try { inodesTmp = File.createTempFile("fsimg_inode", null); inodesTmp.deleteOnExit(); inodes = new FileOutputStream(inodesTmp); } catch (IOException e) { - // appropriate to close raw? - IOUtils.cleanup(null, raw, dirs); + IOUtils.cleanupWithLogger(null, raw, dirsTmpStream, dirs); throw e; } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
