Skip to content

fix receiver dropped in streamer tests #8490

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
KirillLykov merged 1 commit into from
Oct 17, 2025
Merged

fix receiver dropped in streamer tests #8490

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
31 changes: 17 additions & 14 deletions streamer/src/nonblocking/quic.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1755,16 +1755,19 @@ pub mod test {
}

#[tokio::test(flavor = "multi_thread")]
async fn test_quic_server_exit() {
async fn test_quic_server_exit_on_cancel() {
let SpawnTestServerResult {
join_handle,
receiver: _,
receiver,
server_address: _,
stats: _,
cancel,
} = setup_quic_server(None, QuicServerParams::default_for_tests());
cancel.cancel();
join_handle.await.unwrap();
// test that it is stopped by cancel, not due to receiver
// dropped.
drop(receiver);
}

#[tokio::test(flavor = "multi_thread")]
Expand Down Expand Up @@ -1839,7 +1842,7 @@ pub mod test {
solana_logger::setup();
let SpawnTestServerResult {
join_handle,
receiver: _,
receiver,
server_address,
stats,
cancel,
Expand All @@ -1866,6 +1869,7 @@ pub mod test {
assert!(s1.write_all(&[0u8]).await.is_err());

cancel.cancel();
drop(receiver);
join_handle.await.unwrap();
}

Expand All @@ -1874,13 +1878,14 @@ pub mod test {
solana_logger::setup();
let SpawnTestServerResult {
join_handle,
receiver: _,
receiver,
server_address,
stats: _,
cancel,
} = setup_quic_server(None, QuicServerParams::default_for_tests());
check_block_multiple_connections(server_address).await;
cancel.cancel();
drop(receiver);
join_handle.await.unwrap();
}

Expand Down Expand Up @@ -1935,7 +1940,8 @@ pub mod test {
);

let start = Instant::now();
while stats.connection_removed.load(Ordering::Relaxed) != 1 {
while stats.connection_removed.load(Ordering::Relaxed) != 1 && start.elapsed().as_secs() < 1
{
debug!("First connection not removed yet");
sleep(Duration::from_millis(10)).await;
}
Expand All @@ -1950,7 +1956,8 @@ pub mod test {
);

let start = Instant::now();
while stats.connection_removed.load(Ordering::Relaxed) != 2 {
while stats.connection_removed.load(Ordering::Relaxed) != 2 && start.elapsed().as_secs() < 1
{
debug!("Second connection not removed yet");
sleep(Duration::from_millis(10)).await;
}
Expand Down Expand Up @@ -2000,7 +2007,7 @@ pub mod test {
check_multiple_writes(receiver, server_address, Some(&client_keypair)).await;
cancel.cancel();
join_handle.await.unwrap();
sleep(Duration::from_millis(100)).await;
Copy link
Copy Markdown
Author

@KirillLykov KirillLykov Oct 15, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is no need to wait 100ms after the stop of the streamer because now streamer will wait for all the connections to stop as well.


assert_eq!(
stats
.connection_added_from_unstaked_peer
Expand Down Expand Up @@ -2032,7 +2039,7 @@ pub mod test {
check_multiple_writes(receiver, server_address, Some(&client_keypair)).await;
cancel.cancel();
join_handle.await.unwrap();
sleep(Duration::from_millis(100)).await;

assert_eq!(
stats
.connection_added_from_staked_peer
Expand All @@ -2056,7 +2063,7 @@ pub mod test {
check_multiple_writes(receiver, server_address, None).await;
cancel.cancel();
join_handle.await.unwrap();
sleep(Duration::from_millis(100)).await;

assert_eq!(
stats
.connection_added_from_staked_peer
Expand Down Expand Up @@ -2135,10 +2142,7 @@ pub mod test {
assert_eq!(stats.total_new_connections.load(Ordering::Relaxed), 2);
cancel.cancel();
t.await.unwrap();
// handle of the streamer doesn't wait for the child task to finish, so
// it is not deterministic if the tasks handling connections exit before
// the assertion below or after.
sleep(Duration::from_millis(100)).await;

assert_eq!(stats.total_connections.load(Ordering::Relaxed), 0);
assert_eq!(stats.total_new_connections.load(Ordering::Relaxed), 2);
}
Expand Down Expand Up @@ -2514,7 +2518,6 @@ pub mod test {
}
assert_eq!(expected_num_txs, num_txs_received);

// stop it
cancel.cancel();
join_handle.await.unwrap();

Expand Down
Loading