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

Use a channel in sync timing test #2281

Closed
wants to merge 2 commits into from
Closed

Use a channel in sync timing test #2281

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3b97002
use channel instead of atomics
oxarbitrage Jun 10, 2021
49e7efa
add `Arc` to senders
oxarbitrage Jun 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
33 changes: 16 additions & 17 deletions zebrad/src/components/sync/tests/timing.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
use futures::future;
use std::sync::{
atomic::{AtomicU8, Ordering},
Arc,
};

use tokio::{
runtime::Runtime,
sync::watch,
time::{timeout, Duration},
};

Expand Down Expand Up @@ -75,11 +73,11 @@ fn request_genesis_is_rate_limited() {
// The number of calls to `request_genesis()` we are going to be testing for
const RETRIES_TO_RUN: u8 = 3;

// create some counters that will be updated inside async blocks
let peer_requests_counter = Arc::new(AtomicU8::new(0));
let peer_requests_counter_in_service = Arc::clone(&peer_requests_counter);
let state_requests_counter = Arc::new(AtomicU8::new(0));
let state_requests_counter_in_service = Arc::clone(&state_requests_counter);
// create some watchers that will be updated inside async blocks
let mut peer_requests_counter = 0;
let mut state_requests_counter = 0;
let (peer_requests_sender, peer_requests_receiver) = watch::channel(peer_requests_counter);
let (state_requests_sender, state_requests_receiver) = watch::channel(state_requests_counter);
Comment on lines +79 to +80
Copy link
Contributor

Choose a reason for hiding this comment

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

The error seems to be caused by ChainSync needing to clone the service to create multiple instances of it. To allow that, I think one way would be to simply wrap the senders with Arcs so that the watch::Sender is shared between all instances:

Suggested change
let (peer_requests_sender, peer_requests_receiver) = watch::channel(peer_requests_counter);
let (state_requests_sender, state_requests_receiver) = watch::channel(state_requests_counter);
let (peer_requests_sender, peer_requests_receiver) = watch::channel(peer_requests_counter);
let (state_requests_sender, state_requests_receiver) = watch::channel(state_requests_counter);
let peer_requests_sender = Arc::new(peer_requests_sender);
let state_requests_sender = Arc::new(state_requests_sender);


let runtime = Runtime::new().expect("Failed to create Tokio runtime");
let _guard = runtime.enter();
Expand All @@ -90,7 +88,8 @@ fn request_genesis_is_rate_limited() {
match request {
zebra_network::Request::BlocksByHash(_) => {
// Track the call
peer_requests_counter_in_service.fetch_add(1, Ordering::SeqCst);
peer_requests_counter += 1;
let _ = peer_requests_sender.send(peer_requests_counter);
// Respond with `Error`
future::err("block not found".into())
}
Expand All @@ -104,7 +103,8 @@ fn request_genesis_is_rate_limited() {
match request {
zebra_state::Request::Depth(_) => {
// Track the call
state_requests_counter_in_service.fetch_add(1, Ordering::SeqCst);
state_requests_counter += 1;
let _ = state_requests_sender.send(state_requests_counter);
// Respond with `None`
future::ok(zebra_state::Response::Depth(None))
}
Expand Down Expand Up @@ -138,11 +138,10 @@ fn request_genesis_is_rate_limited() {
.await;
});

let peer_requests_counter = peer_requests_counter.load(Ordering::SeqCst);
assert!(peer_requests_counter >= RETRIES_TO_RUN);
assert!(peer_requests_counter <= RETRIES_TO_RUN * (BLOCK_DOWNLOAD_RETRY_LIMIT as u8) * 2);
assert_eq!(
state_requests_counter.load(Ordering::SeqCst),
RETRIES_TO_RUN
//let peer_requests_counter = peer_requests_counter.load(Ordering::SeqCst);
assert!(*peer_requests_receiver.borrow() >= RETRIES_TO_RUN);
assert!(
*peer_requests_receiver.borrow() <= RETRIES_TO_RUN * (BLOCK_DOWNLOAD_RETRY_LIMIT as u8) * 2
);
assert_eq!(*state_requests_receiver.borrow(), RETRIES_TO_RUN);
}