Return-Path: X-Original-To: apmail-hbase-commits-archive@www.apache.org Delivered-To: apmail-hbase-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 30DC5179F5 for ; Thu, 27 Aug 2015 22:26:11 +0000 (UTC) Received: (qmail 14603 invoked by uid 500); 27 Aug 2015 22:26:11 -0000 Delivered-To: apmail-hbase-commits-archive@hbase.apache.org Received: (qmail 14564 invoked by uid 500); 27 Aug 2015 22:26:11 -0000 Mailing-List: contact commits-help@hbase.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@hbase.apache.org Delivered-To: mailing list commits@hbase.apache.org Received: (qmail 14554 invoked by uid 99); 27 Aug 2015 22:26:10 -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; Thu, 27 Aug 2015 22:26:10 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id DACF1E7E7C; Thu, 27 Aug 2015 22:26:10 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: eclark@apache.org To: commits@hbase.apache.org Message-Id: <40abed06ec664804ba897f29497fb32a@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: hbase git commit: HBASE-14313 After a Connection sees ConnectionClosingException it never recovers -- ADDENDUM Date: Thu, 27 Aug 2015 22:26:10 +0000 (UTC) Repository: hbase Updated Branches: refs/heads/branch-1.1 4b5c4e44b -> b331902f8 HBASE-14313 After a Connection sees ConnectionClosingException it never recovers -- ADDENDUM Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/b331902f Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/b331902f Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/b331902f Branch: refs/heads/branch-1.1 Commit: b331902f8744031be3758341f7e6d4e3cfdf5949 Parents: 4b5c4e4 Author: Elliott Clark Authored: Wed Aug 26 22:28:38 2015 -0700 Committer: Elliott Clark Committed: Thu Aug 27 15:22:14 2015 -0700 ---------------------------------------------------------------------- .../src/main/java/org/apache/hadoop/hbase/ipc/RpcClientImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/b331902f/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RpcClientImpl.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RpcClientImpl.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RpcClientImpl.java index a2d7172..cb84bde 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RpcClientImpl.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RpcClientImpl.java @@ -935,7 +935,9 @@ public class RpcClientImpl extends AbstractRpcClient { } catch (IOException e) { // We set the value inside the synchronized block, this way the next in line // won't even try to write - markClosed(e); + if (markClosed(e)) { + close(); + } writeException = e; interrupt(); }