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

Prevent PeerSet service to be buffered #1718

Closed
wants to merge 5 commits into from
Closed

Prevent PeerSet service to be buffered #1718

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8b92ddd
assert when peerset is buffered
oxarbitrage Feb 9, 2021
626a315
add suggestions from code review
oxarbitrage Feb 9, 2021
e356264
use type_name() and remove type_of()
oxarbitrage Feb 10, 2021
82bd8a7
move the assert outside the loop
oxarbitrage Feb 10, 2021
3e2f7b5
remove newline
oxarbitrage Feb 10, 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
9 changes: 9 additions & 0 deletions zebra-network/src/peer_set/set.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
use std::net::SocketAddr;
use std::{
any::type_name,
collections::HashMap,
fmt::Debug,
future::Future,
Expand Down Expand Up @@ -405,6 +406,14 @@ where
Pin<Box<dyn Future<Output = Result<Self::Response, Self::Error>> + Send + 'static>>;

fn poll_ready(&mut self, cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
// Using `poll_ready` without `call` fills up `Buffer` reservations, causing hangs.
// See #1593 for details.
assert!(
!type_name::<D::Service>().contains("Buffer"),
"Clients must not use tower::Buffer, because PeerSet uses `poll_ready`
multiple times before each `call`, which causes buffer hangs"
);

self.poll_background_errors(cx)?;
// Process peer discovery updates.
let _ = self.poll_discover(cx)?;
Expand Down