You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by iv...@apache.org on 2013/08/20 14:07:23 UTC

svn commit: r1515791 - in /zookeeper/bookkeeper/branches/branch-4.2: CHANGES.txt bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/NIOServerFactory.java

Author: ivank
Date: Tue Aug 20 12:07:23 2013
New Revision: 1515791

URL: http://svn.apache.org/r1515791
Log:
BOOKKEEPER-660: Logs too noisy on NIOServerFactory when client drops a connection (mmerli via ivank)

Modified:
    zookeeper/bookkeeper/branches/branch-4.2/CHANGES.txt
    zookeeper/bookkeeper/branches/branch-4.2/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/NIOServerFactory.java

Modified: zookeeper/bookkeeper/branches/branch-4.2/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/branches/branch-4.2/CHANGES.txt?rev=1515791&r1=1515790&r2=1515791&view=diff
==============================================================================
--- zookeeper/bookkeeper/branches/branch-4.2/CHANGES.txt (original)
+++ zookeeper/bookkeeper/branches/branch-4.2/CHANGES.txt Tue Aug 20 12:07:23 2013
@@ -62,6 +62,8 @@ Release 4.2.2 - Unreleased
 
         BOOKKEEPER-624: Reduce logs generated by ReplicationWorker (vinay via ivank)
 
+        BOOKKEEPER-660: Logs too noisy on NIOServerFactory when client drops a connection (mmerli via ivank)
+
       hedwig-server:
 
         BOOKKEEPER-579: TestSubAfterCloseSub was put in a wrong package (sijie via ivank)

Modified: zookeeper/bookkeeper/branches/branch-4.2/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/NIOServerFactory.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/branches/branch-4.2/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/NIOServerFactory.java?rev=1515791&r1=1515790&r2=1515791&view=diff
==============================================================================
--- zookeeper/bookkeeper/branches/branch-4.2/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/NIOServerFactory.java (original)
+++ zookeeper/bookkeeper/branches/branch-4.2/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/NIOServerFactory.java Tue Aug 20 12:07:23 2013
@@ -236,7 +236,9 @@ public class NIOServerFactory extends Th
                 if (k.isReadable()) {
                     int rc = sock.read(incomingBuffer);
                     if (rc < 0) {
-                        throw new IOException("Read error");
+                        LOG.info("Peer closed connection. rc={} {}", rc, sock);
+                        close();
+                        return;
                     }
                     if (incomingBuffer.remaining() == 0) {
                         incomingBuffer.flip();