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 2012/05/08 07:03:30 UTC
svn commit: r1335338 - in /zookeeper/trunk: CHANGES.txt
src/java/main/org/apache/zookeeper/server/quorum/QuorumCnxManager.java
Author: michim
Date: Tue May 8 05:03:30 2012
New Revision: 1335338
URL: http://svn.apache.org/viewvc?rev=1335338&view=rev
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=1335338&r1=1335337&r2=1335338&view=diff
==============================================================================
--- zookeeper/trunk/CHANGES.txt (original)
+++ zookeeper/trunk/CHANGES.txt Tue May 8 05:03:30 2012
@@ -289,6 +289,9 @@ IMPROVEMENTS:
ZOOKEEPER-1451. C API improperly logs getaddrinfo failures on Linux when using glibc (Stephen Tyree via michim)
+ ZOOKEEPER-1440. Spurious log error messages when QuorumCnxManager is shutting
+ down (Jordan Zimmerman via michim)
+
Release 3.4.0 -
Non-backward compatible changes:
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=1335338&r1=1335337&r2=1335338&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 Tue May 8 05:03:30 2012
@@ -493,16 +493,18 @@ public class QuorumCnxManager {
numRetries = 0;
}
} catch (IOException e) {
- LOG.error("Exception while listening", e);
- numRetries++;
- try {
- ss.close();
- Thread.sleep(1000);
- } catch (IOException ie) {
- LOG.error("Error closing server socket", ie);
- } catch (InterruptedException ie) {
- LOG.error("Interrupted while sleeping. " +
- "Ignoring exception", ie);
+ if ( !shutdown ) {
+ LOG.error("Exception while listening", e);
+ numRetries++;
+ try {
+ ss.close();
+ Thread.sleep(1000);
+ } catch (IOException ie) {
+ LOG.error("Error closing server socket", ie);
+ } catch (InterruptedException ie) {
+ LOG.error("Interrupted while sleeping. " +
+ "Ignoring exception", ie);
+ }
}
}
}