Return-Path: X-Original-To: apmail-zookeeper-commits-archive@www.apache.org Delivered-To: apmail-zookeeper-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 24231109FD for ; Mon, 16 Dec 2013 04:21:04 +0000 (UTC) Received: (qmail 5525 invoked by uid 500); 16 Dec 2013 04:21:03 -0000 Delivered-To: apmail-zookeeper-commits-archive@zookeeper.apache.org Received: (qmail 5470 invoked by uid 500); 16 Dec 2013 04:21:02 -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@ Delivered-To: mailing list commits@zookeeper.apache.org Received: (qmail 5461 invoked by uid 99); 16 Dec 2013 04:21:02 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 16 Dec 2013 04:21:02 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 16 Dec 2013 04:21:01 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 2906E238889B; Mon, 16 Dec 2013 04:20:41 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: svn commit: r1551112 - in /zookeeper/branches/branch-3.4: CHANGES.txt src/java/main/org/apache/zookeeper/server/NettyServerCnxn.java src/java/main/org/apache/zookeeper/server/NettyServerCnxnFactory.java Date: Mon, 16 Dec 2013 04:20:41 -0000 To: commits@zookeeper.apache.org From: michim@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20131216042041.2906E238889B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: michim Date: Mon Dec 16 04:20:40 2013 New Revision: 1551112 URL: http://svn.apache.org/r1551112 Log: ZOOKEEPER-1839. Deadlock in NettyServerCnxn (Rakesh R via michim) Modified: zookeeper/branches/branch-3.4/CHANGES.txt zookeeper/branches/branch-3.4/src/java/main/org/apache/zookeeper/server/NettyServerCnxn.java zookeeper/branches/branch-3.4/src/java/main/org/apache/zookeeper/server/NettyServerCnxnFactory.java Modified: zookeeper/branches/branch-3.4/CHANGES.txt URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.4/CHANGES.txt?rev=1551112&r1=1551111&r2=1551112&view=diff ============================================================================== --- zookeeper/branches/branch-3.4/CHANGES.txt (original) +++ zookeeper/branches/branch-3.4/CHANGES.txt Mon Dec 16 04:20:40 2013 @@ -186,6 +186,8 @@ BUGFIXES: ZOOKEEPER-1837. Fix JMXEnv checks (potential race conditions) (Germán Blanco via fpj) + ZOOKEEPER-1839. Deadlock in NettyServerCnxn (Rakesh R via michim) + IMPROVEMENTS: ZOOKEEPER-1564. Allow JUnit test build with IBM Java Modified: zookeeper/branches/branch-3.4/src/java/main/org/apache/zookeeper/server/NettyServerCnxn.java URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.4/src/java/main/org/apache/zookeeper/server/NettyServerCnxn.java?rev=1551112&r1=1551111&r2=1551112&view=diff ============================================================================== --- zookeeper/branches/branch-3.4/src/java/main/org/apache/zookeeper/server/NettyServerCnxn.java (original) +++ zookeeper/branches/branch-3.4/src/java/main/org/apache/zookeeper/server/NettyServerCnxn.java Mon Dec 16 04:20:40 2013 @@ -108,12 +108,12 @@ public class NettyServerCnxn extends Ser .getRemoteAddress()).getAddress()); s.remove(this); } - - if (channel.isOpen()) { - channel.close(); - } - factory.unregisterConnection(this); } + + if (channel.isOpen()) { + channel.close(); + } + factory.unregisterConnection(this); } @Override Modified: zookeeper/branches/branch-3.4/src/java/main/org/apache/zookeeper/server/NettyServerCnxnFactory.java URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.4/src/java/main/org/apache/zookeeper/server/NettyServerCnxnFactory.java?rev=1551112&r1=1551111&r2=1551112&view=diff ============================================================================== --- zookeeper/branches/branch-3.4/src/java/main/org/apache/zookeeper/server/NettyServerCnxnFactory.java (original) +++ zookeeper/branches/branch-3.4/src/java/main/org/apache/zookeeper/server/NettyServerCnxnFactory.java Mon Dec 16 04:20:40 2013 @@ -260,20 +260,22 @@ public class NettyServerCnxnFactory exte LOG.debug("closeAll()"); } + NettyServerCnxn[] allCnxns = null; synchronized (cnxns) { - // got to clear all the connections that we have in the selector - for (NettyServerCnxn cnxn : cnxns.toArray(new NettyServerCnxn[cnxns.size()])) { - try { - cnxn.close(); - } catch (Exception e) { - LOG.warn("Ignoring exception closing cnxn sessionid 0x" - + Long.toHexString(cnxn.getSessionId()), e); - } + allCnxns = cnxns.toArray(new NettyServerCnxn[cnxns.size()]); + } + // got to clear all the connections that we have in the selector + for (NettyServerCnxn cnxn : allCnxns) { + try { + cnxn.close(); + } catch (Exception e) { + LOG.warn("Ignoring exception closing cnxn sessionid 0x" + + Long.toHexString(cnxn.getSessionId()), e); } } if (LOG.isDebugEnabled()) { - LOG.debug("allChannels size:" + allChannels.size() - + " cnxns size:" + cnxns.size()); + LOG.debug("allChannels size:" + allChannels.size() + " cnxns size:" + + allCnxns.length); } } @@ -282,17 +284,18 @@ public class NettyServerCnxnFactory exte if (LOG.isDebugEnabled()) { LOG.debug("closeSession sessionid:0x" + sessionId); } - + NettyServerCnxn[] allCnxns = null; synchronized (cnxns) { - for (NettyServerCnxn cnxn : cnxns.toArray(new NettyServerCnxn[cnxns.size()])) { - if (cnxn.getSessionId() == sessionId) { - try { - cnxn.close(); - } catch (Exception e) { - LOG.warn("exception during session close", e); - } - break; + allCnxns = cnxns.toArray(new NettyServerCnxn[cnxns.size()]); + } + for (NettyServerCnxn cnxn : allCnxns) { + if (cnxn.getSessionId() == sessionId) { + try { + cnxn.close(); + } catch (Exception e) { + LOG.warn("exception during session close", e); } + break; } } }