From common-commits-return-77957-archive-asf-public=cust-asf.ponee.io@hadoop.apache.org Wed Jan 24 23:35:42 2018 Return-Path: X-Original-To: archive-asf-public@eu.ponee.io Delivered-To: archive-asf-public@eu.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by mx-eu-01.ponee.io (Postfix) with ESMTP id 2DC67180676 for ; Wed, 24 Jan 2018 23:35:42 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 1C8FE160C4F; Wed, 24 Jan 2018 22:35:42 +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 76411160C4E for ; Wed, 24 Jan 2018 23:35:41 +0100 (CET) Received: (qmail 86697 invoked by uid 500); 24 Jan 2018 22:35:32 -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 86329 invoked by uid 99); 24 Jan 2018 22:35:32 -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; Wed, 24 Jan 2018 22:35:32 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id A1E32F4DF5; Wed, 24 Jan 2018 22:35:30 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: aengineer@apache.org To: common-commits@hadoop.apache.org Date: Wed, 24 Jan 2018 22:35:59 -0000 Message-Id: <40ff2670971e4bf0a451ae60a196f61d@git.apache.org> In-Reply-To: <449ff7436d854b3e8bafac8efec3974b@git.apache.org> References: <449ff7436d854b3e8bafac8efec3974b@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [30/50] [abbrv] hadoop git commit: HDFS-13039. StripedBlockReader.createBlockReader leaks socket on IOException. (Lei (Eddy) Xu) HDFS-13039. StripedBlockReader.createBlockReader leaks socket on IOException. (Lei (Eddy) Xu) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/2ed9d61a Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/2ed9d61a Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/2ed9d61a Branch: refs/heads/HDFS-7240 Commit: 2ed9d61aadaffbf56ae0ed124520edab97646b49 Parents: c191538 Author: Lei Xu Authored: Fri Jan 19 16:40:58 2018 -0800 Committer: Lei Xu Committed: Fri Jan 19 16:40:58 2018 -0800 ---------------------------------------------------------------------- .../hdfs/server/datanode/erasurecode/StripedBlockReader.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/2ed9d61a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/erasurecode/StripedBlockReader.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/erasurecode/StripedBlockReader.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/erasurecode/StripedBlockReader.java index 39ef67e..5e77de5 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/erasurecode/StripedBlockReader.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/erasurecode/StripedBlockReader.java @@ -105,6 +105,7 @@ class StripedBlockReader { if (offsetInBlock >= block.getNumBytes()) { return null; } + Peer peer = null; try { InetSocketAddress dnAddr = stripedReader.getSocketAddress4Transfer(source); @@ -120,7 +121,7 @@ class StripedBlockReader { * * TODO: add proper tracer */ - Peer peer = newConnectedPeer(block, dnAddr, blockToken, source); + peer = newConnectedPeer(block, dnAddr, blockToken, source); if (peer.isLocal()) { this.isLocal = true; } @@ -131,6 +132,7 @@ class StripedBlockReader { } catch (IOException e) { LOG.info("Exception while creating remote block reader, datanode {}", source, e); + IOUtils.closeStream(peer); return null; } } --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org For additional commands, e-mail: common-commits-help@hadoop.apache.org