Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

p2p: re-check after sleeps #2664

Merged
merged 13 commits into from Nov 11, 2018
Merged

p2p: re-check after sleeps #2664

Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
7f41070
p2p: re-check after sleeps
mgurevin Oct 18, 2018
5f7d055
use NodeInfo as an interface
mgurevin Oct 18, 2018
53704f7
Revert "use NodeInfo as an interface"
mgurevin Nov 8, 2018
70cfc73
Revert "p2p: re-check after sleeps"
mgurevin Nov 8, 2018
02ad2f0
Merge remote-tracking branch 'upstream/develop' into HEAD
mgurevin Nov 8, 2018
0c6e0fc
preserve dial to itself
mgurevin Nov 8, 2018
64d92dd
ignore ensured connections while re-connecting
mgurevin Nov 8, 2018
cf16823
re-check after sleep
mgurevin Nov 8, 2018
060d0b5
keep protocol definition on net addresses
mgurevin Nov 8, 2018
72b9370
decrease log level
mgurevin Nov 8, 2018
c8c8345
Revert "preserve dial to itself"
mgurevin Nov 8, 2018
bb0f5c4
correct func comment according to modification
melekes Nov 9, 2018
abab122
Merge branch 'develop' into develop
ebuchman Nov 11, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 10 additions & 2 deletions p2p/switch.go
View file
Open in desktop
Expand Up @@ -328,6 +328,11 @@ func (sw *Switch) reconnectToPeer(addr *NetAddress) {
return
}

if sw.IsDialingOrExistingAddress(addr) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks. These changes are partial fixes for #2716.

Note the races are still possible, but this should help significantly. We'll likely have to rearchitect the code a bit to solve this fully.

Thanks!

sw.Logger.Debug("Peer connection has been established or dialed while we waiting next try", "addr", addr)
return
}

err := sw.DialPeerWithAddress(addr, true)
if err == nil {
return // success
Expand Down Expand Up @@ -415,12 +420,15 @@ func (sw *Switch) DialPeersAsync(addrBook AddrBook, peers []string, persistent b
if addr.Same(ourAddr) {
sw.Logger.Debug("Ignore attempt to connect to ourselves", "addr", addr, "ourAddr", ourAddr)
return
} else if sw.IsDialingOrExistingAddress(addr) {
}

sw.randomSleep(0)

if sw.IsDialingOrExistingAddress(addr) {
sw.Logger.Debug("Ignore attempt to connect to an existing peer", "addr", addr)
return
}

sw.randomSleep(0)
err := sw.DialPeerWithAddress(addr, persistent)
if err != nil {
switch err.(type) {
Expand Down