discovery: ensure gossiper syncer has idempotent exit/start, fix deadlock #1325
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
cfromknecht
reviewed
Jun 4, 2018
discovery/gossiper.go
Outdated
| @@ -1134,6 +1134,8 @@ func (d *AuthenticatedGossiper) networkHandler() { | |||
| for peerPub := range d.peerSyncers { | |||
| syncerPeers[peerPub] = struct{}{} | |||
| } | |||
|
|
|||
| peerSyncers := d.peerSyncers | |||
There was a problem hiding this comment.
Since peerSyncers is accessed w/o a lock below, it seems these values should be copied into a new map, as mutations in the original map will be reflected in peerSyncers
There was a problem hiding this comment.
Very true! Might as well just combine it with the above and use that below, will update.
In this commit, we fix an existing deadlock in the gossiper->server->peer pipeline by ensuring that we're not holding the syncer mutex while we attempt to have a syncer filter out the rest of gossip messages.
Roasbeef
force-pushed
the
gossip-syncer-fixes
branch
from
5645659
to
e6d46f6
Compare
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.
In this commit, we fix an existing deadlock in the
gossiper->server->peer pipeline by ensuring that we're not holding the
syncer mutex while we attempt to have a syncer filter out the rest of
gossip messages.