You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by cd...@apache.org on 2017/12/16 01:45:47 UTC
[1/2] hadoop git commit: Revert "HDFS-12903. [READ] Fix closing
streams in ImageWriter"
Repository: hadoop
Updated Branches:
refs/heads/HDFS-9806 be27bcb90 -> 89faba2f2
Revert "HDFS-12903. [READ] Fix closing streams in ImageWriter"
This reverts commit c1bf2654b0e9118985b8518b0254eac4dd302a2f.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/cc95161f
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/cc95161f
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/cc95161f
Branch: refs/heads/HDFS-9806
Commit: cc95161f440f94df08665b4e9ac199ed0cb636a2
Parents: be27bcb
Author: Chris Douglas <cd...@apache.org>
Authored: Fri Dec 15 17:40:50 2017 -0800
Committer: Chris Douglas <cd...@apache.org>
Committed: Fri Dec 15 17:40:50 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/cc95161f/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 1be5190..14a5f8f 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 (Throwable e) {
+ } catch (IOException e) {
IOUtils.cleanupWithLogger(null, raw, dirsTmpStream);
- throw new IOException(e);
+ throw e;
}
try {
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[2/2] hadoop git commit: HDFS-12903. [READ] Fix closing streams in
ImageWriter. Contributed by Virajith Jalaparti
Posted by cd...@apache.org.
HDFS-12903. [READ] Fix closing streams in ImageWriter. Contributed by Virajith Jalaparti
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/89faba2f
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/89faba2f
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/89faba2f
Branch: refs/heads/HDFS-9806
Commit: 89faba2f2939cda3c5f07e3d0470b2237785b3ce
Parents: cc95161
Author: Chris Douglas <cd...@apache.org>
Authored: Fri Dec 15 17:41:46 2017 -0800
Committer: Chris Douglas <cd...@apache.org>
Committed: Fri Dec 15 17:41:46 2017 -0800
----------------------------------------------------------------------
.../dev-support/findbugs-exclude.xml | 28 ++++++++++++++++++++
1 file changed, 28 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/89faba2f/hadoop-tools/hadoop-fs2img/dev-support/findbugs-exclude.xml
----------------------------------------------------------------------
diff --git a/hadoop-tools/hadoop-fs2img/dev-support/findbugs-exclude.xml b/hadoop-tools/hadoop-fs2img/dev-support/findbugs-exclude.xml
new file mode 100644
index 0000000..b60767f
--- /dev/null
+++ b/hadoop-tools/hadoop-fs2img/dev-support/findbugs-exclude.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<FindBugsFilter>
+
+ <!-- Spotbugs 3.1.x not detecting that IOUtils::cleanupWithLogger
+ closes streams safely -->
+ <Match>
+ <Class name="org.apache.hadoop.hdfs.server.namenode.ImageWriter" />
+ <Method name="<init>" />
+ <Bug pattern="OBL_UNSATISFIED_OBLIGATION_EXCEPTION_EDGE" />
+ </Match>
+
+</FindBugsFilter>
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org