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 940AD200D08 for ; Wed, 23 Aug 2017 02:16:37 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 928961616A3; Wed, 23 Aug 2017 00:16:37 +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 E86DF160BDB for ; Wed, 23 Aug 2017 02:16:36 +0200 (CEST) Received: (qmail 46807 invoked by uid 500); 23 Aug 2017 00:16:36 -0000 Mailing-List: contact commits-help@zookeeper.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@zookeeper.apache.org Delivered-To: mailing list commits@zookeeper.apache.org Received: (qmail 46780 invoked by uid 99); 23 Aug 2017 00:16:34 -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, 23 Aug 2017 00:16:34 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 2AC45E053D; Wed, 23 Aug 2017 00:16:33 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: camille@apache.org To: commits@zookeeper.apache.org Message-Id: <7ddb303f02bb42b1b27d9eee65d9c179@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: zookeeper git commit: ZOOKEEPER-2836: fix SocketTimeoutException Date: Wed, 23 Aug 2017 00:16:33 +0000 (UTC) archived-at: Wed, 23 Aug 2017 00:16:37 -0000 Repository: zookeeper Updated Branches: refs/heads/master b64d50441 -> 52aff3eca ZOOKEEPER-2836: fix SocketTimeoutException Author: bitgaoshu Reviewers: camille camille@apache.org Closes #336 from bitgaoshu/ZOOKEEPER-2836 Project: http://git-wip-us.apache.org/repos/asf/zookeeper/repo Commit: http://git-wip-us.apache.org/repos/asf/zookeeper/commit/52aff3ec Tree: http://git-wip-us.apache.org/repos/asf/zookeeper/tree/52aff3ec Diff: http://git-wip-us.apache.org/repos/asf/zookeeper/diff/52aff3ec Branch: refs/heads/master Commit: 52aff3eca439bba70f2b4d175ce331754dcd03db Parents: b64d504 Author: bitgaoshu Authored: Tue Aug 22 20:16:27 2017 -0400 Committer: Camille Fournier Committed: Tue Aug 22 20:16:27 2017 -0400 ---------------------------------------------------------------------- .../server/quorum/QuorumCnxManager.java | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/zookeeper/blob/52aff3ec/src/java/main/org/apache/zookeeper/server/quorum/QuorumCnxManager.java ---------------------------------------------------------------------- diff --git a/src/java/main/org/apache/zookeeper/server/quorum/QuorumCnxManager.java b/src/java/main/org/apache/zookeeper/server/quorum/QuorumCnxManager.java index eab1338..c8f73a3 100644 --- a/src/java/main/org/apache/zookeeper/server/quorum/QuorumCnxManager.java +++ b/src/java/main/org/apache/zookeeper/server/quorum/QuorumCnxManager.java @@ -26,6 +26,7 @@ import java.net.InetSocketAddress; import java.net.ServerSocket; import java.net.Socket; import java.net.SocketException; +import java.net.SocketTimeoutException; import java.nio.BufferUnderflowException; import java.nio.ByteBuffer; import java.nio.channels.UnresolvedAddressException; @@ -639,12 +640,18 @@ public class QuorumCnxManager { setName(addr.toString()); ss.bind(addr); while (!shutdown) { - client = ss.accept(); - setSockOpts(client); - LOG.info("Received connection request " - + client.getRemoteSocketAddress()); - receiveConnection(client); - numRetries = 0; + try { + client = ss.accept(); + setSockOpts(client); + LOG.info("Received connection request " + + client.getRemoteSocketAddress()); + receiveConnection(client); + numRetries = 0; + } catch (SocketTimeoutException e) { + LOG.warn("The socket is listening for the election accepted " + + "and it timed out unexpectedly, but will retry." + + "see ZOOKEEPER-2836"); + } } } catch (IOException e) { if (shutdown) {