Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id DDE83200D5C for ; Fri, 15 Dec 2017 21:58:43 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id DC660160C14; Fri, 15 Dec 2017 20:58:43 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 2F2A6160C04 for ; Fri, 15 Dec 2017 21:58:43 +0100 (CET) Received: (qmail 71543 invoked by uid 500); 15 Dec 2017 20:58:42 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 71529 invoked by uid 99); 15 Dec 2017 20:58:42 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 15 Dec 2017 20:58:42 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 21D5CE001D; Fri, 15 Dec 2017 20:58:41 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jlowe@apache.org To: common-commits@hadoop.apache.org Message-Id: <006f0dcea30c47b5a830fde1e8ee3ce9@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: hadoop git commit: HDFS-12881. Output streams closed with IOUtils suppressing write errors. Contributed by Ajay Kumar Date: Fri, 15 Dec 2017 20:58:41 +0000 (UTC) archived-at: Fri, 15 Dec 2017 20:58:44 -0000 Repository: hadoop Updated Branches: refs/heads/branch-2.8 9c318f70b -> 7db994458 HDFS-12881. Output streams closed with IOUtils suppressing write errors. Contributed by Ajay Kumar (cherry picked from commit 9ae8d1a8de2ffbc8a0082a0089f477d4cefea030) Conflicts: hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/FsDatasetImpl.java Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/7db99445 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/7db99445 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/7db99445 Branch: refs/heads/branch-2.8 Commit: 7db99445884a140c4585c0966309a9f9429d5518 Parents: 9c318f7 Author: Jason Lowe Authored: Fri Dec 15 14:47:54 2017 -0600 Committer: Jason Lowe Committed: Fri Dec 15 14:57:16 2017 -0600 ---------------------------------------------------------------------- .../hdfs/server/datanode/fsdataset/impl/FsDatasetImpl.java | 4 +++- .../apache/hadoop/hdfs/server/namenode/FSImageTestUtil.java | 8 ++++++-- .../tools/offlineImageViewer/TestOfflineImageViewer.java | 6 ++++-- 3 files changed, 13 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/7db99445/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/FsDatasetImpl.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/FsDatasetImpl.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/FsDatasetImpl.java index ce0f7c0..b40e3f2 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/FsDatasetImpl.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/FsDatasetImpl.java @@ -1085,8 +1085,10 @@ class FsDatasetImpl implements FsDatasetSpi { // calculate and write the last crc checksum.calculateChunkedSums(data, 0, offset, crcs, 0); metaOut.write(crcs, 0, 4); + metaOut.close(); + metaOut = null; } finally { - IOUtils.cleanup(LOG, metaOut); + IOUtils.closeStream(metaOut); } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/7db99445/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/FSImageTestUtil.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/FSImageTestUtil.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/FSImageTestUtil.java index 12b5180..9b0723a 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/FSImageTestUtil.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/FSImageTestUtil.java @@ -108,6 +108,8 @@ public abstract class FSImageTestUtil { try { raf.seek(IMAGE_TXID_POS); raf.writeLong(0); + raf.close(); + raf = null; } finally { IOUtils.closeStream(raf); } @@ -542,9 +544,11 @@ public abstract class FSImageTestUtil { out = new FileOutputStream(versionFile); props.store(out, null); - + out.close(); + out = null; } finally { - IOUtils.cleanup(null, fis, out); + IOUtils.closeStream(fis); + IOUtils.closeStream(out); } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/7db99445/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/TestOfflineImageViewer.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/TestOfflineImageViewer.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/TestOfflineImageViewer.java index d921986..073187e 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/TestOfflineImageViewer.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/TestOfflineImageViewer.java @@ -271,9 +271,11 @@ public class TestOfflineImageViewer { in = new FileInputStream(src); out = new FileOutputStream(dest); in.getChannel().transferTo(0, MAX_BYTES, out.getChannel()); + out.close(); + out = null; } finally { - IOUtils.cleanup(null, in); - IOUtils.cleanup(null, out); + IOUtils.closeStream(in); + IOUtils.closeStream(out); } } --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org For additional commands, e-mail: common-commits-help@hadoop.apache.org