Skip to content

ZOOKEEPER-4424: Re-throwing IOException in Leader$LearnerCnxAcceptor$LearnerCnxAcceptorHandler#acceptConnections is not always needed #1784

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

Open
functioner wants to merge 1 commit into
base: master
Choose a base branch
from
+12 −5
Open

ZOOKEEPER-4424: Re-throwing IOException in Leader$LearnerCnxAcceptor$LearnerCnxAcceptorHandler#acceptConnections is not always needed #1784

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
17 changes: 12 additions & 5 deletions zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/Leader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -515,13 +515,20 @@ private void acceptConnections() throws IOException {
boolean error = false;
try {
socket = serverSocket.accept();
BufferedInputStream is;

// start with the initLimit, once the ack is processed
// in LearnerHandler switch to the syncLimit
socket.setSoTimeout(self.tickTime * self.initLimit);
socket.setTcpNoDelay(nodelay);
try {
// start with the initLimit, once the ack is processed
// in LearnerHandler switch to the syncLimit
socket.setSoTimeout(self.tickTime * self.initLimit);
socket.setTcpNoDelay(nodelay);

is = new BufferedInputStream(socket.getInputStream());
} catch (IOException e) {
error = true;
return; // close the socket at the finally block
}

BufferedInputStream is = new BufferedInputStream(socket.getInputStream());
LearnerHandler fh = new LearnerHandler(socket, is, Leader.this);
fh.start();
} catch (SocketException e) {
Expand Down