From 839d3fc19bdd8c72f941d69bc1674b983843c433 Mon Sep 17 00:00:00 2001 From: Jason Darrell Lowe Date: Thu, 5 Dec 2013 16:06:09 +0000 Subject: [PATCH] svn merge -c 1548179 FIXES: HADOOP-10081. Client.setupIOStreams can leak socket resources on exception or error. Contributed by Tsuyoshi OZAWA git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1548181 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ .../src/main/java/org/apache/hadoop/ipc/Client.java | 1 + 2 files changed, 4 insertions(+) diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 05e03289ac8..2e89a676448 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -238,6 +238,9 @@ Release 2.3.0 - UNRELEASED HDFS-5560. Trash configuration log statements prints incorrect units. (Josh Elser via Andrew Wang) + HADOOP-10081. Client.setupIOStreams can leak socket resources on exception + or error (Tsuyoshi OZAWA via jlowe) + Release 2.2.0 - 2013-10-13 INCOMPATIBLE CHANGES diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java index 63ef0963f43..105c31d9890 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java @@ -1158,6 +1158,7 @@ private synchronized void close() { // cleanup calls cleanupCalls(); } + closeConnection(); if (LOG.isDebugEnabled()) LOG.debug(getName() + ": closed"); }