HDFS-12903. [READ] Fix closing streams in ImageWriter
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/c1bf2654 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/c1bf2654 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/c1bf2654 Branch: refs/heads/HDFS-9806 Commit: c1bf2654b0e9118985b8518b0254eac4dd302a2f Parents: eaf5f99 Author: Virajith Jalaparti <[email protected]> Authored: Thu Dec 7 14:21:24 2017 -0800 Committer: Virajith Jalaparti <[email protected]> Committed: Fri Dec 15 10:25:35 2017 -0800 ---------------------------------------------------------------------- .../java/org/apache/hadoop/hdfs/server/namenode/ImageWriter.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/c1bf2654/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 0abc7a7..c21c282 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 @@ -183,9 +183,9 @@ public class ImageWriter implements Closeable { dirsTmp.deleteOnExit(); dirsTmpStream = new FileOutputStream(dirsTmp); dirs = beginSection(dirsTmpStream); - } catch (IOException e) { + } catch (Throwable e) { IOUtils.cleanupWithLogger(null, raw, dirsTmpStream); - throw e; + throw new IOException(e); } try { --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
