[zookeeper] branch branch-3.5 updated: Revert "ZOOKEEPER-3240: Close socket on Learner shutdown to avoid dangling so…"

[andor]

This is an automated email from the ASF dual-hosted git repository.

andor pushed a commit to branch branch-3.5
in repository https://gitbox.apache.org/repos/asf/zookeeper.git


The following commit(s) were added to refs/heads/branch-3.5 by this push:
     new 41db89e  Revert "ZOOKEEPER-3240: Close socket on Learner shutdown to 
avoid dangling so…"
41db89e is described below

commit 41db89e31aca2fa4818a033b3f1105460614f6e8
Author: Andor Molnar <an...@apache.org>
AuthorDate: Wed Jan 30 11:52:50 2019 +0100

    Revert "ZOOKEEPER-3240: Close socket on Learner shutdown to avoid dangling 
so…"
    
    This reverts commit 015f9d662f2638b5ba66f07ac963de9f11d80bfd.
---
 .../java/org/apache/zookeeper/server/quorum/Follower.java     |  6 +++++-
 .../main/java/org/apache/zookeeper/server/quorum/Learner.java | 11 -----------
 .../java/org/apache/zookeeper/server/quorum/Observer.java     |  6 +++++-
 3 files changed, 10 insertions(+), 13 deletions(-)

diff --git 
a/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/Follower.java
 
b/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/Follower.java
index b79f570..6508601 100644
--- 
a/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/Follower.java
+++ 
b/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/Follower.java
@@ -94,7 +94,11 @@ public class Follower extends Learner{
                 }
             } catch (Exception e) {
                 LOG.warn("Exception when following the leader", e);
-                closeSocket();
+                try {
+                    sock.close();
+                } catch (IOException e1) {
+                    e1.printStackTrace();
+                }
     
                 // clear pending revalidations
                 pendingRevalidations.clear();
diff --git 
a/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/Learner.java
 
b/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/Learner.java
index 42c5aa4..3b739ac 100644
--- 
a/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/Learner.java
+++ 
b/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/Learner.java
@@ -658,7 +658,6 @@ public class Learner {
         self.setZooKeeperServer(null);
         self.closeAllConnections();
         self.adminServer.setZooKeeperServer(null);
-        closeSocket();
         // shutdown previous zookeeper
         if (zk != null) {
             zk.shutdown();
@@ -668,14 +667,4 @@ public class Learner {
     boolean isRunning() {
         return self.isRunning() && zk.isRunning();
     }
-
-    void closeSocket() {
-        try {
-            if (sock != null && !sock.isClosed()) {
-                sock.close();
-            }
-        } catch (IOException e) {
-            LOG.warn("Ignoring error closing connection to leader", e);
-        }
-    }
 }
diff --git 
a/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/Observer.java
 
b/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/Observer.java
index 050582d..f0f724e 100644
--- 
a/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/Observer.java
+++ 
b/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/Observer.java
@@ -79,7 +79,11 @@ public class Observer extends Learner{
                 }
             } catch (Exception e) {
                 LOG.warn("Exception when observing the leader", e);
-                closeSocket();
+                try {
+                    sock.close();
+                } catch (IOException e1) {
+                    e1.printStackTrace();
+                }
 
                 // clear pending revalidations
                 pendingRevalidations.clear();