Skip to content

protocols/identify: Fix race condition in discover_peer_after_disconnect #2744

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

Merged
mxinden merged 2 commits into from
Jul 4, 2022
Merged

protocols/identify: Fix race condition in discover_peer_after_disconnect #2744

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1830877
protocols/identify: Fix race condition in discover_peer_after_disconnect
mxinden Jul 2, 2022
116cdab
Merge branch 'master' into identify-flaky
mxinden Jul 4, 2022
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: 9 additions & 1 deletion protocols/identify/src/identify.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -518,6 +518,7 @@ mod tests {
use libp2p::tcp::TcpConfig;
use libp2p_core::{identity, muxing::StreamMuxerBox, transport, upgrade, PeerId, Transport};
use libp2p_swarm::{Swarm, SwarmEvent};
use std::time::Duration;

fn transport() -> (
identity::PublicKey,
Expand Down Expand Up @@ -700,7 +701,14 @@ mod tests {

let mut swarm1 = {
let (pubkey, transport) = transport();
let protocol = Identify::new(IdentifyConfig::new("a".to_string(), pubkey.clone()));
let protocol = Identify::new(
IdentifyConfig::new("a".to_string(), pubkey.clone())
// `swarm1` will set `KeepAlive::No` once it identified `swarm2` and thus
// closes the connection. At this point in time `swarm2` might not yet have
// identified `swarm1`. To give `swarm2` enough time, set an initial delay on
// `swarm1`.
.with_initial_delay(Duration::from_secs(10)),
);

Swarm::new(transport, protocol, pubkey.to_peer_id())
};
Expand Down