Skip to content

ZOOKEEPER-3240: Close socket on Learner shutdown to avoid dangling so… #767

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
enixon wants to merge 1 commit into from
Closed

ZOOKEEPER-3240: Close socket on Learner shutdown to avoid dangling so… #767

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/Follower.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,11 +114,7 @@ void followLeader() throws InterruptedException {
}
} catch (Exception e) {
LOG.warn("Exception when following the leader", e);
try {
sock.close();
} catch (IOException e1) {
e1.printStackTrace();
}
closeSocket();

// clear pending revalidations
pendingRevalidations.clear();
Expand Down
11 changes: 11 additions & 0 deletions zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/Learner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -673,6 +673,7 @@ public void shutdown() {
self.setZooKeeperServer(null);
self.closeAllConnections();
self.adminServer.setZooKeeperServer(null);
closeSocket();
// shutdown previous zookeeper
if (zk != null) {
zk.shutdown();
Expand All @@ -682,4 +683,14 @@ public void shutdown() {
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);
}
}
}
6 changes: 1 addition & 5 deletions zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/Observer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,11 +107,7 @@ void observeLeader() throws Exception {
}
} catch (Exception e) {
LOG.warn("Exception when observing the leader", e);
try {
sock.close();
} catch (IOException e1) {
e1.printStackTrace();
}
closeSocket();

// clear pending revalidations
pendingRevalidations.clear();
Expand Down