You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by an...@apache.org on 2019/01/30 10:51:24 UTC
[zookeeper] branch master updated: Revert "ZOOKEEPER-3240: Close socket on Learner shutdown to avoid dangling so…"
This is an automated email from the ASF dual-hosted git repository.
andor pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/zookeeper.git
The following commit(s) were added to refs/heads/master by this push:
new bcbf648 Revert "ZOOKEEPER-3240: Close socket on Learner shutdown to avoid dangling so…"
bcbf648 is described below
commit bcbf64884f2ee3e8a150b0b3c20a8fa03a05162e
Author: Andor Molnar <an...@apache.org>
AuthorDate: Wed Jan 30 11:43:37 2019 +0100
Revert "ZOOKEEPER-3240: Close socket on Learner shutdown to avoid dangling so…"
This reverts commit de7b87cd69dfd38787270c71f00576f9a235e582.
---
.../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 7dcc9cf..49280d3 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
@@ -114,7 +114,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 b5865f8..307b644 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
@@ -673,7 +673,6 @@ public class Learner {
self.setZooKeeperServer(null);
self.closeAllConnections();
self.adminServer.setZooKeeperServer(null);
- closeSocket();
// shutdown previous zookeeper
if (zk != null) {
zk.shutdown();
@@ -683,14 +682,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 3792a04..b688e03 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
@@ -107,7 +107,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();