Making sure that the resolved DNS lists get used in full #3071
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
matkt
reviewed
Nov 16, 2021
| @@ -376,6 +377,7 @@ void attemptPeerConnections() { | |||
| public Stream<DiscoveryPeer> streamDiscoveredPeers() { | |||
| List<DiscoveryPeer> peers = dnsPeers.get(); | |||
| if (peers != null) { | |||
| Collections.shuffle(peers); | |||
| return Stream.concat(peerDiscoveryAgent.streamDiscoveredPeers(), peers.stream()); | |||
| } | |||
| return peerDiscoveryAgent.streamDiscoveredPeers(); | |||
There was a problem hiding this comment.
Maybe we can also shuffle this part ?
There was a problem hiding this comment.
Hmm, unfortunately streams don't have a convenient method to shuffle the elements.
There was a problem hiding this comment.
Shuffling a stream goes against the "lazy" nature of a stream I would say. To shuffle it you would need to process all elements at least once. So you need to collect, shuffle, and convert result to another stream.
|
I am going to add a test covering the |
Signed-off-by: Jiri Peinlich <jiri.peinlich@gmail.com>
Previously we would always process the list from the beginning. We would only try maximumpeers elements from the list and never try more. This PR firstly shuffles the peers list each time before applying it and then also takes from the list for as long as there are free peers slots available. Signed-off-by: Jiri Peinlich <jiri.peinlich@gmail.com>
|
I added a test to check the takeWhile |
jflo
approved these changes
Nov 19, 2021
|
SonarCloud Quality Gate failed. |
eum602
pushed a commit
to lacchain/besu
that referenced
this pull request
Nov 3, 2023
…#3071) * Checking that we try hard enough to get peers from dns-discovery Signed-off-by: Jiri Peinlich <jiri.peinlich@gmail.com> * Making sure that the resolved DNS lists get used in full Previously we would always process the list from the beginning. We would only try maximumpeers elements from the list and never try more. This PR firstly shuffles the peers list each time before applying it and then also takes from the list for as long as there are free peers slots available. Signed-off-by: Jiri Peinlich <jiri.peinlich@gmail.com> Co-authored-by: Sally MacFarlane <sally.macfarlane@consensys.net>
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.
Signed-off-by: Jiri Peinlich jiri.peinlich@gmail.com
PR description
Previously we would always process the list of DNS resolved peers from the beginning. We would
at most only try
maxConnectionsvalid elements from the list and never try more. So the eachtime we might be trying the same 25 peers, we connect with them and then drop them. This PR
firstly shuffles the peers list each time before applying it and then also takes from the list for
as long as there are free peers slots available as opposed to guess the limit upfront and hope
that all the peers connect.
Changelog