Fix race in adding connections to connsByPeer #1116
Merged
+52
−32
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
magik6k
reviewed
Jun 7, 2021
Side A could already be running Identify with side B before B had the connection in the connsByPeer, this lead to Connectedness returning NotConnected and Identify failing. Signed-off-by: Jakub Sztandera <kubuxu@protocol.ai>
Kubuxu
force-pushed
the
fix/mocknet-conn-race
branch
from
ea4087e to
79cc9a4
Compare
Kubuxu
pushed a commit
to filecoin-project/lotus
that referenced
this pull request
Jun 7, 2021
This does not resolve the CI issue but prepares us for it after libp2p/go-libp2p#1116 Signed-off-by: Jakub Sztandera <kubuxu@protocol.ai>
Signed-off-by: Jakub Sztandera <kubuxu@protocol.ai>
Kubuxu
force-pushed
the
fix/mocknet-conn-race
branch
from
7440ed7 to
8c97572
Compare
magik6k
approved these changes
Jun 7, 2021
Stebalien
requested changes
Jun 7, 2021
p2p/net/mock/mock_peernet.go
Outdated
Comment on lines
173
to
174
| pn1.Lock() | ||
| pn2.Lock() |
There was a problem hiding this comment.
We need to sort these or we'll deadlock. Same with the other locks we're taking.
Signed-off-by: Jakub Sztandera <kubuxu@protocol.ai>
Stebalien
approved these changes
Jun 7, 2021
# for free
to join this conversation on GitHub.
Already have an account?
# 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.
Side A could already be running Identify with side B before B had the
connection in the connsByPeer, this lead to Connectedness returning
NotConnected and Identify failing.