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 30798200C0E for ; Wed, 18 Jan 2017 00:29:16 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 2F86F160B55; Tue, 17 Jan 2017 23:29:16 +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 79D24160B52 for ; Wed, 18 Jan 2017 00:29:15 +0100 (CET) Received: (qmail 95042 invoked by uid 500); 17 Jan 2017 23:29:12 -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 93517 invoked by uid 99); 17 Jan 2017 23:29:11 -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; Tue, 17 Jan 2017 23:29:11 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 35F36E0059; Tue, 17 Jan 2017 23:29:11 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: subru@apache.org To: common-commits@hadoop.apache.org Date: Tue, 17 Jan 2017 23:29:17 -0000 Message-Id: <64052963d6204004987ae2f086dfb0c7@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [07/50] [abbrv] hadoop git commit: HDFS-11342. Fix FileInputStream leak in loadLastPartialChunkChecksum. Contributed by Chen Liang. archived-at: Tue, 17 Jan 2017 23:29:16 -0000 HDFS-11342. Fix FileInputStream leak in loadLastPartialChunkChecksum. Contributed by Chen Liang. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/a853b4e1 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/a853b4e1 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/a853b4e1 Branch: refs/heads/YARN-2915 Commit: a853b4e1b5742faadf7b667b0cebbc0dac001395 Parents: 2f8e9b7 Author: Arpit Agarwal Authored: Mon Jan 16 13:45:22 2017 -0800 Committer: Arpit Agarwal Committed: Mon Jan 16 13:45:22 2017 -0800 ---------------------------------------------------------------------- .../hdfs/server/datanode/fsdataset/impl/FsVolumeImpl.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/a853b4e1/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/FsVolumeImpl.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/FsVolumeImpl.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/FsVolumeImpl.java index 042ef6e..f6e6a59 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/FsVolumeImpl.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/FsVolumeImpl.java @@ -19,6 +19,7 @@ package org.apache.hadoop.hdfs.server.datanode.fsdataset.impl; import java.io.BufferedWriter; import java.io.File; +import java.io.FileInputStream; import java.io.FilenameFilter; import java.io.IOException; import java.io.OutputStreamWriter; @@ -1122,9 +1123,11 @@ public class FsVolumeImpl implements FsVolumeSpi { public byte[] loadLastPartialChunkChecksum( File blockFile, File metaFile) throws IOException { // readHeader closes the temporary FileInputStream. - DataChecksum dcs = BlockMetadataHeader - .readHeader(fileIoProvider.getFileInputStream(this, metaFile)) - .getChecksum(); + DataChecksum dcs; + try (FileInputStream fis = fileIoProvider.getFileInputStream( + this, metaFile)) { + dcs = BlockMetadataHeader.readHeader(fis).getChecksum(); + } final int checksumSize = dcs.getChecksumSize(); final long onDiskLen = blockFile.length(); final int bytesPerChecksum = dcs.getBytesPerChecksum(); --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org For additional commands, e-mail: common-commits-help@hadoop.apache.org