-
Notifications
You must be signed in to change notification settings - Fork 7.3k
ZOOKEEPER-4419: The potential exception in Learner$LeaderConnector.connectToLeader may cause unnecessary re-election or service delay #1782
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.
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
2
commits into
apache:master
Choose a base branch
from
functioner:ZOOKEEPER-4419
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+19
−23
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -396,7 +396,7 @@ public void run() { | |
| } | ||
|
|
||
| private Socket connectToLeader() throws IOException, X509Exception, InterruptedException { | ||
| Socket sock = createSocket(); | ||
| Socket sock = null; | ||
|
|
||
| // leader connection timeout defaults to tickTime * initLimit | ||
| int connectTimeout = self.tickTime * self.initLimit; | ||
|
|
@@ -410,8 +410,10 @@ private Socket connectToLeader() throws IOException, X509Exception, InterruptedE | |
| int remainingTimeout; | ||
| long startNanoTime = nanoTime(); | ||
|
|
||
| for (int tries = 0; tries < 5 && socket.get() == null; tries++) { | ||
| for (int tries = 0; tries < 5; tries++) { | ||
| try { | ||
| sock = createSocket(); | ||
|
|
||
| // recalculate the init limit time because retries sleep for 1000 milliseconds | ||
| remainingTimeout = connectTimeout - (int) ((nanoTime() - startNanoTime) / 1_000_000); | ||
| if (remainingTimeout <= 0) { | ||
|
|
@@ -423,35 +425,29 @@ private Socket connectToLeader() throws IOException, X509Exception, InterruptedE | |
| if (self.isSslQuorum()) { | ||
| ((SSLSocket) sock).startHandshake(); | ||
| } | ||
| sock.setTcpNoDelay(nodelay); | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. @functioner I believe this shouldn't be deleted, along with break statement next line
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I feel same here. |
||
| break; | ||
| } catch (IOException e) { | ||
| // close failed socket before retrying | ||
| if (sock != null) { | ||
| try { | ||
| sock.close(); | ||
| } catch (IOException closeException) { | ||
| LOG.debug("Failed to close socket after connection failure", closeException); | ||
| } | ||
| sock = null; | ||
| } | ||
| remainingTimeout = connectTimeout - (int) ((nanoTime() - startNanoTime) / 1_000_000); | ||
|
|
||
| if (remainingTimeout <= leaderConnectDelayDuringRetryMs) { | ||
| LOG.error( | ||
| "Unexpected exception, connectToLeader exceeded. tries={}, remaining init limit={}, connecting to {}", | ||
| tries, | ||
| remainingTimeout, | ||
| address, | ||
| e); | ||
| LOG.error("Unexpected exception, connectToLeader exceeded. tries={}, remaining init limit={}, connecting to {}", | ||
| tries, remainingTimeout, address, e); | ||
| throw e; | ||
| } else if (tries >= 4) { | ||
| LOG.error( | ||
| "Unexpected exception, retries exceeded. tries={}, remaining init limit={}, connecting to {}", | ||
| tries, | ||
| remainingTimeout, | ||
| address, | ||
| e); | ||
| LOG.error("Unexpected exception, retries exceeded. tries={}, remaining init limit={}, connecting to {}", | ||
| tries, remainingTimeout, address, e); | ||
| throw e; | ||
| } else { | ||
| LOG.warn( | ||
| "Unexpected exception, tries={}, remaining init limit={}, connecting to {}", | ||
| tries, | ||
| remainingTimeout, | ||
| address, | ||
| e); | ||
| sock = createSocket(); | ||
| LOG.warn("Unexpected exception, tries={}, remaining init limit={}, connecting to {}", | ||
| tries, remainingTimeout, address, e); | ||
| } | ||
| } | ||
| Thread.sleep(leaderConnectDelayDuringRetryMs); | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
connectToLeadercould be called concurrently for different addresses, so it is good to break eagerly when there is a success connection.