relay: fix deadlock when closing #2171
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
| r.host.RemoveStreamHandler(proto.ProtoIDv2Hop) | ||
| r.host.Network().StopNotify(r.notifiee) | ||
| r.scope.Done() | ||
| r.cancel() | ||
|
|
||
| r.mx.Lock() |
There was a problem hiding this comment.
Would it make sense to move the untagging a few lines up? That way you'd only need to lock the mutex once.
There was a problem hiding this comment.
That line actually has a race condition :(
if both r.gc and r.Close(waiting on lock before untag peer) happen at the same time we'd untag the peer twice with the conn manager since in close we don't delete the entry from the map.
I updated it to also cleanup the background goroutine like it happens in other services. If you want I'll make the exact change you asked.
| r.host.RemoveStreamHandler(proto.ProtoIDv2Hop) | ||
| r.host.Network().StopNotify(r.notifiee) | ||
| r.scope.Done() | ||
| r.cancel() | ||
| for p := range r.rsvp { | ||
| r.host.ConnManager().UntagPeer(p, "relay-reservation") | ||
| } |
There was a problem hiding this comment.
Where does the untagging happen now?
There was a problem hiding this comment.
marten-seemann
changed the title
marten-seemann
approved these changes
Mar 5, 2023
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.
fixes: #2167