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

Jump to bottom

Stop NetworkService when NetworkController is dropped #4175

Closed
wants to merge 2 commits into from
Closed

Stop NetworkService when NetworkController is dropped #4175

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
53e9f03
Don't print error message when ckb received stop signal multiple times
eval-exec Oct 5, 2023
bee38a2
Add drop_guard to NetworkController
eval-exec Oct 7, 2023
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
21 changes: 21 additions & 0 deletions network/src/network.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1095,8 +1095,12 @@ impl NetworkService {
.unzip();

let receiver: CancellationToken = new_tokio_exit_rx();

let server_canceller: CancellationToken = CancellationToken::new();

let (start_sender, start_receiver) = mpsc::channel();
{
let server_canceller_clone = server_canceller.clone();
let network_state = Arc::clone(&network_state);
let p2p_control: ServiceAsyncControl = p2p_control.clone().into();
handle.spawn_task(async move {
Expand Down Expand Up @@ -1134,6 +1138,15 @@ impl NetworkService {

break;
},
_ = server_canceller_clone.cancelled() => {

debug!("NetworkController dropped, start shutdown...");
let _ = p2p_control.shutdown().await;
// Drop senders to stop all corresponding background task
drop(bg_signals);

break;
},
else => {
let _ = p2p_control.shutdown().await;
// Drop senders to stop all corresponding background task
Expand Down Expand Up @@ -1165,6 +1178,7 @@ impl NetworkService {
network_state,
p2p_control,
ping_controller,
server_canceller,
})
}
}
Expand All @@ -1176,6 +1190,13 @@ pub struct NetworkController {
network_state: Arc<NetworkState>,
p2p_control: ServiceControl,
ping_controller: Option<Sender<()>>,
server_canceller: CancellationToken,
}

impl Drop for NetworkController {
fn drop(&mut self) {
self.server_canceller.cancel();
}
}

impl NetworkController {
Expand Down
4 changes: 2 additions & 2 deletions util/stop-handler/src/stop_register.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use ckb_channel::TrySendError;
use ckb_logger::{debug, error, info, trace, warn};
use ckb_logger::{debug, info, trace, warn};
use ckb_util::Mutex;
use tokio_util::sync::CancellationToken;

Expand Down Expand Up @@ -61,7 +61,7 @@ pub fn broadcast_exit_signals() {
.iter()
.for_each(|tx| match tx.try_send(()) {
Ok(_) => {}
Err(TrySendError::Full(_)) => error!("send exit signal to channel failed since the channel is full, this should not happen"),
Err(TrySendError::Full(_)) => debug!("ckb process has received stop signal already"),
Err(TrySendError::Disconnected(_)) => {
info!("broadcast thread: channel is disconnected")
}
Expand Down
Loading