replication: fix BinlogSyncer.Close hang on SSH tunnels#1128
Merged
Conversation
serprex
force-pushed
the
fix-binlog-close-deadlock
branch
from
390e9be to
23a677d
Compare
![gemini-code-assist[bot]](https://avatars.githubusercontent.com/in/956858?s=60&v=4){kind=small}
Contributor
There was a problem hiding this comment.
Code Review
This pull request modifies the close method in BinlogSyncer to ensure the underlying connection is closed if SetReadDeadline fails. This change prevents potential deadlocks when using transports that do not support deadlines, such as SSH tunnels. A new test case, TestCloseUnblocksWhenSetReadDeadlineFails, along with a mock connection type, has been added to verify this behavior. I have no feedback to provide.
SetReadDeadline unblocks ReadPacket so onStream notices ctx cancellation. Some transports (notably SSH tunnels) refuse deadlines with an error, in which case close the underlying connection to force ReadPacket to return. Otherwise wg.Wait below parks forever when KILL also fails to reach server (e.g. thread already reaped, "ERROR 1094 unknown thread id")
serprex
force-pushed
the
fix-binlog-close-deadlock
branch
from
23a677d to
72c85c9
Compare
lance6716
approved these changes
May 2, 2026
lance6716
left a comment
lance6716
left a comment
Collaborator
There was a problem hiding this comment.
Sorry for the late review
dbnski
pushed a commit
to dbnski/go-mysql
that referenced
this pull request
Jul 10, 2026
…#1128) SetReadDeadline unblocks ReadPacket so onStream notices ctx cancellation. Some transports (notably SSH tunnels) refuse deadlines with an error, in which case close the underlying connection to force ReadPacket to return. Otherwise wg.Wait below parks forever when KILL also fails to reach server (e.g. thread already reaped, "ERROR 1094 unknown thread id") Co-authored-by: lance6716 <lance6716@gmail.com>
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
SetReadDeadline unblocks ReadPacket so onStream notices ctx cancellation. Some transports (notably SSH tunnels) refuse deadlines with an error, in which case close the underlying connection to force ReadPacket to return. Otherwise wg.Wait below parks forever when KILL also fails to reach server (e.g. thread already reaped, "ERROR 1094 unknown thread id")
see PeerDB-io/peerdb#4195