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

Revert "Stop using CallAllUnordered in peer_set::add_initial_peers" #1734

Merged
merged 2 commits into from
Feb 15, 2021
Merged

Revert "Stop using CallAllUnordered in peer_set::add_initial_peers" #1734

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9f330d2
Revert "Stop using CallAllUnordered in peer_set::add_initial_peers (#…
teor2345 Feb 15, 2021
9bf0b70
Add a correctness comment to justify the revert
teor2345 Feb 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions zebra-network/src/peer_set/initialize.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,10 +194,15 @@ where
S::Future: Send + 'static,
{
info!(?initial_peers, "Connecting to initial peer set");
let mut handshakes = initial_peers
.iter()
.map(|request| connector.clone().oneshot(*request))
.collect::<futures::stream::FuturesUnordered<_>>();
// ## Correctness:
//
// Each `CallAll` can hold one `Buffer` or `Batch` reservation for
// an indefinite period. We can use `CallAllUnordered` without filling
// the underlying `Inbound` buffer, because we immediately drive this
// single `CallAll` to completion, and handshakes have a short timeout.
use tower::util::CallAllUnordered;
let addr_stream = futures::stream::iter(initial_peers.into_iter());
let mut handshakes = CallAllUnordered::new(connector, addr_stream);

while let Some(handshake_result) = handshakes.next().await {
tx.send(handshake_result).await?;
Expand Down