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 A3DC510722 for ; Wed, 12 Mar 2014 21:44:55 +0000 (UTC) Received: (qmail 3331 invoked by uid 500); 12 Mar 2014 21:44:52 -0000 Delivered-To: apmail-zookeeper-commits-archive@zookeeper.apache.org Received: (qmail 3297 invoked by uid 500); 12 Mar 2014 21:44:48 -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 3115 invoked by uid 99); 12 Mar 2014 21:44:44 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 12 Mar 2014 21:44:44 +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; Wed, 12 Mar 2014 21:44:42 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 15C66238899C; Wed, 12 Mar 2014 21:44:21 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1576936 - in /zookeeper/trunk: CHANGES.txt src/java/main/org/apache/zookeeper/server/quorum/QuorumCnxManager.java Date: Wed, 12 Mar 2014 21:44:20 -0000 To: commits@zookeeper.apache.org From: michim@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140312214421.15C66238899C@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: michim Date: Wed Mar 12 21:44:20 2014 New Revision: 1576936 URL: http://svn.apache.org/r1576936 Log: ZOOKEEPER-1440. Spurious log error messages when QuorumCnxManager is shutting down (Jordan Zimmerman via michim) Modified: zookeeper/trunk/CHANGES.txt zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/QuorumCnxManager.java Modified: zookeeper/trunk/CHANGES.txt URL: http://svn.apache.org/viewvc/zookeeper/trunk/CHANGES.txt?rev=1576936&r1=1576935&r2=1576936&view=diff ============================================================================== --- zookeeper/trunk/CHANGES.txt (original) +++ zookeeper/trunk/CHANGES.txt Wed Mar 12 21:44:20 2014 @@ -783,6 +783,9 @@ IMPROVEMENTS: ZOOKEEPER-1430. add maven deploy support to the build (Giridharan Kesavan via phunt) + ZOOKEEPER-1440. Spurious log error messages when QuorumCnxManager is shutting + down (Jordan Zimmerman via michim) + headers Release 3.4.0 - Modified: zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/QuorumCnxManager.java URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/QuorumCnxManager.java?rev=1576936&r1=1576935&r2=1576936&view=diff ============================================================================== --- zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/QuorumCnxManager.java (original) +++ zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/QuorumCnxManager.java Wed Mar 12 21:44:20 2014 @@ -545,15 +545,19 @@ public class QuorumCnxManager { } catch (IOException e) { if ( !shutdown ) { LOG.error("Exception while listening", e); - numRetries++; - try { - ss.close(); - Thread.sleep(1000); - } catch (IOException ie) { + } + numRetries++; + try { + ss.close(); + Thread.sleep(1000); + } catch (IOException ie) { + if ( !shutdown ) { LOG.error("Error closing server socket", ie); - } catch (InterruptedException ie) { + } + } catch (InterruptedException ie) { + if ( !shutdown ) { LOG.error("Interrupted while sleeping. " + - "Ignoring exception", ie); + "Ignoring exception", ie); } } }