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

fix(network): Reconnect with peers after brief network interruption #7853

Merged
merged 2 commits into from
Oct 27, 2023
Merged

fix(network): Reconnect with peers after brief network interruption #7853

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
08d3a50
Fixes bug where Zebra won't reconnect to peers after brief loss of ne…
arya2 Oct 26, 2023
5f3bf47
only dial on timercrawl when theres a new address or zero active outb…
arya2 Oct 27, 2023
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
10 changes: 6 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 @@ -896,7 +896,7 @@ where
// There weren't any peers, so try to get more peers.
teor2345 marked this conversation as resolved.
Show resolved Hide resolved
debug!("demand for peers but no available candidates");

crawl(candidates, demand_tx).await?;
crawl(candidates, demand_tx, false).await?;

Ok(DemandCrawlFinished)
}
Expand All @@ -910,6 +910,7 @@ where
Ok(TimerCrawl { tick }) => {
let candidates = candidates.clone();
let demand_tx = demand_tx.clone();
let should_always_dial = active_outbound_connections.update_count() == 0;

let crawl_handle = tokio::spawn(
async move {
Expand All @@ -918,7 +919,7 @@ where
"crawling for more peers in response to the crawl timer"
);

crawl(candidates, demand_tx).await?;
crawl(candidates, demand_tx, should_always_dial).await?;

Ok(TimerCrawlFinished)
}
Expand Down Expand Up @@ -957,11 +958,12 @@ where
}

/// Try to get more peers using `candidates`, then queue a connection attempt using `demand_tx`.
/// If there were no new peers, the connection attempt is skipped.
/// If there were no new peers and `should_always_dial` is false, the connection attempt is skipped.
#[instrument(skip(candidates, demand_tx))]
async fn crawl<S>(
candidates: Arc<futures::lock::Mutex<CandidateSet<S>>>,
mut demand_tx: futures::channel::mpsc::Sender<MorePeers>,
should_always_dial: bool,
) -> Result<(), BoxError>
where
S: Service<Request, Response = Response, Error = BoxError> + Send + Sync + 'static,
Expand All @@ -976,7 +978,7 @@ where
result
};
let more_peers = match result {
Ok(more_peers) => more_peers,
Ok(more_peers) => more_peers.or_else(|| should_always_dial.then_some(MorePeers)),
Err(e) => {
info!(
?e,
Expand Down
Loading