You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by mi...@apache.org on 2014/03/12 22:44:20 UTC
svn commit: r1576936 - in /zookeeper/trunk: CHANGES.txt
src/java/main/org/apache/zookeeper/server/quorum/QuorumCnxManager.java
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);
}
}
}