[Merged by Bors] - Improved peer management #2993
Closed
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
AgeManning
added
ready-for-review
AgeManning
added
do-not-merge
and removed
ready-for-review
AgeManning
added
ready-for-review
|
Ok, this guy is looking much better. There were few other things I had to add in. In particular, when we dial peers sometimes libp2p doesn't return the peer-id when we cannot connect to a multiaddr. This leaves the peer in the Dialing state in the peerdb. This would be fine, except that we use the number of dialiing peers in determining whether to accept incoming connections. I've added a timeout, 15 seconds such that if a peer is in the dialing state for more than 15 seconds (i.e libp2p has not informed us of its failure) we mark it as disconnected. This is handled in the peer manager. |
divagant-martian
added
the
under-review
AgeManning
force-pushed
the
discovery-outbound-peer-management
branch
from
dddcf53
to
fa14cbe
Compare
divagant-martian
approved these changes
Feb 17, 2022
michaelsproul
requested changes
Feb 17, 2022
beacon_node/lighthouse_network/src/peer_manager/peerdb/peer_info.rs
Outdated
Show resolved
Hide resolved
beacon_node/lighthouse_network/src/peer_manager/peerdb/peer_info.rs
Outdated
Show resolved
Hide resolved
beacon_node/lighthouse_network/src/peer_manager/peerdb/peer_info.rs
Outdated
Show resolved
Hide resolved
beacon_node/lighthouse_network/src/peer_manager/peerdb/peer_info.rs
Outdated
Show resolved
Hide resolved
michaelsproul
approved these changes
Feb 18, 2022
michaelsproul
added
ready-for-merge
|
bors r+ |
bors bot
pushed a commit
that referenced
this pull request
Feb 18, 2022
## Issue Addressed I noticed in some logs some excess and unecessary discovery queries. What was happening was we were pruning our peers down to our outbound target and having some disconnect. When we are below this threshold we try to find more peers (even if we are at our peer limit). The request becomes futile because we have no more peer slots. This PR corrects this issue and advances the pruning mechanism to favour subnet peers. An overview the new logic added is: - We prune peers down to a target outbound peer count which is higher than the minimum outbound peer count. - We only search for more peers if there is room to do so, and we are below the minimum outbound peer count not the target. So this gives us some buffer for peers to disconnect. The buffer is currently 10% The modified pruning logic is documented in the code but for reference it should do the following: - Prune peers with bad scores first - If we need to prune more peers, then prune peers that are subscribed to a long-lived subnet - If we still need to prune peers, the prune peers that we have a higher density of on any given subnet which should drive for uniform peers across all subnets. This will need a bit of testing as it modifies some significant peer management behaviours in lighthouse.
|
Pull request successfully merged into unstable. Build succeeded: |
bors
bot
changed the title
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.
Issue Addressed
I noticed in some logs some excess and unecessary discovery queries. What was happening was we were pruning our peers down to our outbound target and having some disconnect. When we are below this threshold we try to find more peers (even if we are at our peer limit). The request becomes futile because we have no more peer slots.
This PR corrects this issue and advances the pruning mechanism to favour subnet peers.
An overview the new logic added is:
The modified pruning logic is documented in the code but for reference it should do the following:
This will need a bit of testing as it modifies some significant peer management behaviours in lighthouse.