[client] Fix peer close deadlock #3904
Merged
Conversation
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
|
There was a problem hiding this comment.
Pull Request Overview
This PR removes the mutex lock in isConnectedOnAllWay to avoid a deadlock scenario with the Close function.
- Removed
mu.Lock/Unlockaround status check inisConnectedOnAllWay - Added a comment acknowledging the ideal mutex protection and potential deadlock
Comments suppressed due to low confidence (1)
client/internal/peer/conn.go:693
- Add a concurrency-focused test that invokes
isConnectedOnAllWayandClosein parallel to verify there is no data race or deadlock.
func (conn *Conn) isConnectedOnAllWay() (connected bool) {
| @@ -691,8 +691,7 @@ func (conn *Conn) evalStatus() ConnStatus { | |||
| } | |||
|
|
|||
| func (conn *Conn) isConnectedOnAllWay() (connected bool) { | |||
| conn.mu.Lock() | |||
| defer conn.mu.Unlock() | |||
| // would be better to protect this with a mutex, but it could cause deadlock with Close function | |||
There was a problem hiding this comment.
Consider using an atomic variable or a try-lock mechanism (e.g., sync/atomic or TryLock) to safely read the connected state without introducing a potential deadlock.
Suggested change
| // would be better to protect this with a mutex, but it could cause deadlock with Close function | |
| // Use atomic variables to safely read the connection states without risking deadlocks |
Copilot uses AI. Check for mistakes.
mlsmaycon
approved these changes
May 30, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Describe your changes
If the guard calls isConnectedOnAllWay at the wrong time when Close has already been called, it can result in a deadlock.
Issue ticket number and link
Stack
Checklist