[Backport] Ensure tried collisions resolve, and allow feeler connections to existing outbound netgroups #2257
Conversation
This file contains hidden or 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
random-zebra
previously approved these changes
Apr 3, 2021
random-zebra
left a comment
random-zebra
left a comment
There was a problem hiding this comment.
utACK f1949c1104770c13c89d38d5fd7e70cbbe9b12c1
Fixes a bug where feelers could be stuck trying to resolve a collision in the tried table that is to an address in the same netgroup as an existing outbound peer. Thanks to Muoi Tran for the original bug report and detailed debug logs to track this down.
After 40 minutes, time out a test-before-evict entry and just evict without testing. Otherwise, if we were unable to test an entry for some reason, we might break using feelers altogether.
furszy
force-pushed
the
2020_addrman_updates
branch
from
f1949c1 to
ccb6a4a
Compare
random-zebra
approved these changes
Apr 8, 2021
random-zebra
left a comment
random-zebra
left a comment
There was a problem hiding this comment.
rebase utACK ccb6a4a, and merging...
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
Two pretty direct back ports for the address manager.
Coming from bitcoin#13115 and bitcoin#15486.