This repository has been archived by the owner on Feb 1, 2023. It is now read-only.
Fix PeerManager signalAvailabiity() race #417
Merged
Conversation
This file contains 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
Stebalien
reviewed
Jun 10, 2020
| @@ -231,6 +231,9 @@ func (pm *PeerManager) UnregisterSession(ses uint64) { | |||
| // signalAvailability is called when a peer's connectivity changes. | |||
| // It informs interested sessions. | |||
| func (pm *PeerManager) signalAvailability(p peer.ID, isConnected bool) { | |||
| pm.psLk.Lock() | |||
| defer pm.psLk.Unlock() | |||
There was a problem hiding this comment.
Note: we call this when holding the pqLk, is that fine?
There was a problem hiding this comment.
Good question, I believe it is ok - we call signalAvailability() from Connect() / Disconnect() which are called from the networking layer.
signalAvailability() calls sessionWantSender.SignalAvailability() which just adds something to a channel in an explicitly non-blocking fashion, so I don't believe it can cause a deadlock.
There was a problem hiding this comment.
Got it. I think we can tighten these locks a bit. We may even be able to split the peerWantManager lock and the peerQueue lock into two.
Stebalien
approved these changes
Jun 10, 2020
Jorropo
pushed a commit
to Jorropo/go-libipfs
that referenced
this pull request
Jan 26, 2023
Fix PeerManager signalAvailabiity() race This commit was moved from ipfs/go-bitswap@06129d6
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Fixes #415