mirror of
https://github.com/fluencelabs/rust-libp2p
synced 2025-06-24 15:21:33 +00:00
Add Throttled
to libp2p-request-response. (#1696)
* Use a single exchange instead of two one_shots. * Add `Throttled` to libp2p-request-response. Wraps the existing `RequestResponse` behaviour and applies strict limits to the number of inbound and outbound requests per peer. The wrapper is opt-in and if not used, the protocol behaviour of `RequestResponse` does not change. This PR also does not introduce an extra protocol, hence the limits applied need to be known a priori for all nodes which is not always possible or desirable. As mentioned in #1687 I think that we should eventually augment the protocol with metadata which allows a more dynamic exchange of requests and responses. This PR also replaces the two oneshot channels with a single one from the scambio crate which saves one allocation per request/response. If not desirable because the crate has seen less testing the first commit could be reverted. * Fix rustdoc error. * Remove some leftovers from development. * Add docs to `NetworBehaviourAction::{map_in,map_out}`. * Apply suggestions from code review Co-authored-by: Roman Borschel <romanb@users.noreply.github.com> * Add `ping_protocol_throttled` test. * Add another test. * Revert "Use a single exchange instead of two one_shots." This reverts commit e34e1297d411298f6c69e238aa6c96e0b795d989. # Conflicts: # protocols/request-response/Cargo.toml # protocols/request-response/src/handler/protocol.rs * Update CHANGELOG. * Update CHANGELOG. Co-authored-by: Roman Borschel <romanb@users.noreply.github.com>
This commit is contained in:
@ -35,13 +35,11 @@ use libp2p_swarm::Swarm;
|
||||
use libp2p_tcp::TcpConfig;
|
||||
use futures::{prelude::*, channel::mpsc};
|
||||
use rand::{self, Rng};
|
||||
use std::{io, iter};
|
||||
use std::{collections::HashSet, io, iter, num::NonZeroU16};
|
||||
|
||||
/// Exercises a simple ping protocol.
|
||||
#[test]
|
||||
fn ping_protocol() {
|
||||
let num_pings: u8 = rand::thread_rng().gen_range(1, 100);
|
||||
|
||||
let ping = Ping("ping".to_string().into_bytes());
|
||||
let pong = Pong("pong".to_string().into_bytes());
|
||||
|
||||
@ -85,6 +83,8 @@ fn ping_protocol() {
|
||||
}
|
||||
};
|
||||
|
||||
let num_pings: u8 = rand::thread_rng().gen_range(1, 100);
|
||||
|
||||
let peer2 = async move {
|
||||
let mut count = 0;
|
||||
let addr = rx.next().await.unwrap();
|
||||
@ -116,6 +116,202 @@ fn ping_protocol() {
|
||||
let () = async_std::task::block_on(peer2);
|
||||
}
|
||||
|
||||
/// Like `ping_protocol`, but throttling concurrent requests.
|
||||
#[test]
|
||||
fn ping_protocol_throttled() {
|
||||
let ping = Ping("ping".to_string().into_bytes());
|
||||
let pong = Pong("pong".to_string().into_bytes());
|
||||
|
||||
let protocols = iter::once((PingProtocol(), ProtocolSupport::Full));
|
||||
let cfg = RequestResponseConfig::default();
|
||||
|
||||
let (peer1_id, trans) = mk_transport();
|
||||
let ping_proto1 = RequestResponse::new(PingCodec(), protocols.clone(), cfg.clone()).throttled();
|
||||
let mut swarm1 = Swarm::new(trans, ping_proto1, peer1_id.clone());
|
||||
|
||||
let (peer2_id, trans) = mk_transport();
|
||||
let ping_proto2 = RequestResponse::new(PingCodec(), protocols, cfg).throttled();
|
||||
let mut swarm2 = Swarm::new(trans, ping_proto2, peer2_id.clone());
|
||||
|
||||
let (mut tx, mut rx) = mpsc::channel::<Multiaddr>(1);
|
||||
|
||||
let addr = "/ip4/127.0.0.1/tcp/0".parse().unwrap();
|
||||
Swarm::listen_on(&mut swarm1, addr).unwrap();
|
||||
|
||||
let expected_ping = ping.clone();
|
||||
let expected_pong = pong.clone();
|
||||
|
||||
let limit: u16 = rand::thread_rng().gen_range(1, 10);
|
||||
swarm1.set_default_limit(NonZeroU16::new(limit).unwrap());
|
||||
swarm2.set_default_limit(NonZeroU16::new(limit).unwrap());
|
||||
|
||||
let peer1 = async move {
|
||||
while let Some(_) = swarm1.next().now_or_never() {}
|
||||
|
||||
let l = Swarm::listeners(&swarm1).next().unwrap();
|
||||
tx.send(l.clone()).await.unwrap();
|
||||
|
||||
loop {
|
||||
match swarm1.next().await {
|
||||
throttled::Event::Event(RequestResponseEvent::Message {
|
||||
peer,
|
||||
message: RequestResponseMessage::Request { request, channel }
|
||||
}) => {
|
||||
assert_eq!(&request, &expected_ping);
|
||||
assert_eq!(&peer, &peer2_id);
|
||||
swarm1.send_response(channel, pong.clone());
|
||||
},
|
||||
e => panic!("Peer1: Unexpected event: {:?}", e)
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
let num_pings: u8 = rand::thread_rng().gen_range(1, 100);
|
||||
|
||||
let peer2 = async move {
|
||||
let mut count = 0;
|
||||
let addr = rx.next().await.unwrap();
|
||||
swarm2.add_address(&peer1_id, addr.clone());
|
||||
let mut blocked = false;
|
||||
let mut req_ids = HashSet::new();
|
||||
|
||||
loop {
|
||||
if !blocked {
|
||||
while let Some(id) = swarm2.send_request(&peer1_id, ping.clone()).ok() {
|
||||
req_ids.insert(id);
|
||||
}
|
||||
blocked = true;
|
||||
}
|
||||
match swarm2.next().await {
|
||||
throttled::Event::ResumeSending(peer) => {
|
||||
assert_eq!(peer, peer1_id);
|
||||
blocked = false
|
||||
}
|
||||
throttled::Event::Event(RequestResponseEvent::Message {
|
||||
peer,
|
||||
message: RequestResponseMessage::Response { request_id, response }
|
||||
}) => {
|
||||
count += 1;
|
||||
assert_eq!(&response, &expected_pong);
|
||||
assert_eq!(&peer, &peer1_id);
|
||||
assert!(req_ids.remove(&request_id));
|
||||
if count >= num_pings {
|
||||
break
|
||||
}
|
||||
}
|
||||
e => panic!("Peer2: Unexpected event: {:?}", e)
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
async_std::task::spawn(Box::pin(peer1));
|
||||
let () = async_std::task::block_on(peer2);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn ping_protocol_limit_violation() {
|
||||
let ping = Ping("ping".to_string().into_bytes());
|
||||
let pong = Pong("pong".to_string().into_bytes());
|
||||
|
||||
let protocols = iter::once((PingProtocol(), ProtocolSupport::Full));
|
||||
let cfg = RequestResponseConfig::default();
|
||||
|
||||
let (peer1_id, trans) = mk_transport();
|
||||
let ping_proto1 = RequestResponse::new(PingCodec(), protocols.clone(), cfg.clone()).throttled();
|
||||
let mut swarm1 = Swarm::new(trans, ping_proto1, peer1_id.clone());
|
||||
|
||||
let (peer2_id, trans) = mk_transport();
|
||||
let ping_proto2 = RequestResponse::new(PingCodec(), protocols, cfg).throttled();
|
||||
let mut swarm2 = Swarm::new(trans, ping_proto2, peer2_id.clone());
|
||||
|
||||
let (mut tx, mut rx) = mpsc::channel::<Multiaddr>(1);
|
||||
|
||||
let addr = "/ip4/127.0.0.1/tcp/0".parse().unwrap();
|
||||
Swarm::listen_on(&mut swarm1, addr).unwrap();
|
||||
|
||||
let expected_ping = ping.clone();
|
||||
let expected_pong = pong.clone();
|
||||
|
||||
swarm2.set_default_limit(NonZeroU16::new(2).unwrap());
|
||||
|
||||
let peer1 = async move {
|
||||
while let Some(_) = swarm1.next().now_or_never() {}
|
||||
|
||||
let l = Swarm::listeners(&swarm1).next().unwrap();
|
||||
tx.send(l.clone()).await.unwrap();
|
||||
|
||||
let mut pending_responses = Vec::new();
|
||||
|
||||
loop {
|
||||
match swarm1.next().await {
|
||||
throttled::Event::Event(RequestResponseEvent::Message {
|
||||
peer,
|
||||
message: RequestResponseMessage::Request { request, channel }
|
||||
}) => {
|
||||
assert_eq!(&request, &expected_ping);
|
||||
assert_eq!(&peer, &peer2_id);
|
||||
pending_responses.push((channel, pong.clone()));
|
||||
},
|
||||
throttled::Event::TooManyInboundRequests(p) => {
|
||||
assert_eq!(p, peer2_id);
|
||||
break
|
||||
}
|
||||
e => panic!("Peer1: Unexpected event: {:?}", e)
|
||||
}
|
||||
if pending_responses.len() >= 2 {
|
||||
for (channel, pong) in pending_responses.drain(..) {
|
||||
swarm1.send_response(channel, pong)
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
let num_pings: u8 = rand::thread_rng().gen_range(1, 100);
|
||||
|
||||
let peer2 = async move {
|
||||
let mut count = 0;
|
||||
let addr = rx.next().await.unwrap();
|
||||
swarm2.add_address(&peer1_id, addr.clone());
|
||||
let mut blocked = false;
|
||||
let mut req_ids = HashSet::new();
|
||||
|
||||
loop {
|
||||
if !blocked {
|
||||
while let Some(id) = swarm2.send_request(&peer1_id, ping.clone()).ok() {
|
||||
req_ids.insert(id);
|
||||
}
|
||||
blocked = true;
|
||||
}
|
||||
match swarm2.next().await {
|
||||
throttled::Event::ResumeSending(peer) => {
|
||||
assert_eq!(peer, peer1_id);
|
||||
blocked = false
|
||||
}
|
||||
throttled::Event::Event(RequestResponseEvent::Message {
|
||||
peer,
|
||||
message: RequestResponseMessage::Response { request_id, response }
|
||||
}) => {
|
||||
count += 1;
|
||||
assert_eq!(&response, &expected_pong);
|
||||
assert_eq!(&peer, &peer1_id);
|
||||
assert!(req_ids.remove(&request_id));
|
||||
if count >= num_pings {
|
||||
break
|
||||
}
|
||||
}
|
||||
throttled::Event::Event(RequestResponseEvent::OutboundFailure { error, .. }) => {
|
||||
assert!(matches!(error, OutboundFailure::ConnectionClosed));
|
||||
break
|
||||
}
|
||||
e => panic!("Peer2: Unexpected event: {:?}", e)
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
async_std::task::spawn(Box::pin(peer1));
|
||||
let () = async_std::task::block_on(peer2);
|
||||
}
|
||||
|
||||
fn mk_transport() -> (PeerId, Boxed<(PeerId, StreamMuxerBox), io::Error>) {
|
||||
let id_keys = identity::Keypair::generate_ed25519();
|
||||
let peer_id = id_keys.public().into_peer_id();
|
||||
|
Reference in New Issue
Block a user