ZOOKEEPER-511. bad error handling in FollowerHandle.sendPackets (mahadev via flavio)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/zookeeper/trunk@921853 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -267,6 +267,9 @@ BUGFIXES:
   ZOOKEEPER-696. NPE in the hudson logs, seems nioservercnxn closed twice 
   (phunt via mahadev)
 
+  ZOOKEEPER-511. bad error handling in FollowerHandler.sendPackets
+  (mahadev via flavio)
+
 IMPROVEMENTS:
   ZOOKEEPER-473. cleanup junit tests to eliminate false positives due to
   "socket reuse" and failure to close client (phunt via mahadev)

src/java/main/org/apache/zookeeper/server/quorum/LearnerHandler.java

@@ -139,7 +139,15 @@ public class LearnerHandler extends Thread {
                 oa.writeRecord(p, "packet");
             } catch (IOException e) {
                 if (!sock.isClosed()) {
-                    LOG.warn("Unexpected exception",e);
+                    LOG.warn("Unexpected exception at " + this, e);
+                    try {
+                        // this will cause everything to shutdown on
+                        // this learner handler and will help notify
+                        // the learner/observer instantaneously
+                        sock.close();
+                    } catch(IOException ie) {
+                        LOG.warn("Error closing socket for handler " + this, ie);
+                    }
                 }
                 break;
             }