Fix the dialing priority system #907
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
ghost
assigned 
tomaka
commented
Jan 31, 2019
core/src/nodes/raw_swarm.rs
Outdated
| // knowing. It is possible that the remote has already closed its ougoing attempt because | ||
| // it sees our outgoing attempt as a success. | ||
| // However we cancel any further multiaddress to attempt. | ||
| // TODO: cancel if we don't have dial priority? we should write tests first |
There was a problem hiding this comment.
I think it is critical to do this as well; otherwise our dialing attempt will always replace the remote's connection, regardless of whether we have priority.
twittner
approved these changes
Jan 31, 2019
tomaka
force-pushed
the
fix-priority-system
branch
from
dd8e559 to
94ad788
Compare
tomaka
force-pushed
the
fix-priority-system
branch
from
b769969 to
dc406b6
Compare
|
The test I added fails on master. EDIT: Actually no; I'm having a hard time writing a test that fails on master. |
|
Oh well, let's merge this. |
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 maybe #883, I'm not sure.
Right now, when we dial a node and receive an incoming connection from that same node, we cancel the outgoing attempt.
The problem is that this outgoing attempt may have already succeeded (and we don't know yet), in which case the remote has maybe cancelled its own connection. The outcome is no connection at all.
There is a dialing priority system in place, but it applied only if we receive a new connection from a node we are already connected to.
This PR does the following:
DialErrorevents from nodes we are connected to. In order to clarify this, I changed theremaining_addressesfield (indicating the number of addresses in queue) into anew_statefield that indicates the state of the peer.