Skip to content

fix(nzb-dispatch): bound worker shutdown to one shared deadline (ported from fork) #147

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
thedancingdeveloper merged 1 commit into from
Sep 27, 2026
Merged

fix(nzb-dispatch): bound worker shutdown to one shared deadline (ported from fork) #147

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
36 changes: 32 additions & 4 deletions crates/nzb-dispatch/src/download_engine.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1445,10 +1445,7 @@ impl WorkerPool {
// Notify workers so any parked on notify.notified() wake up.
self.work_queue.notify.notify_waiters();

let timeout = Duration::from_secs(10);
for h in handles {
let _ = tokio::time::timeout(timeout, h).await;
}
await_worker_shutdown(handles, Duration::from_secs(10)).await;

if let Some(h) = self.supervisor_handle.lock().take() {
h.abort();
Expand All @@ -1465,6 +1462,23 @@ impl WorkerPool {
}
}

async fn await_worker_shutdown(mut handles: Vec<JoinHandle<()>>, timeout: Duration) {
let deadline = tokio::time::Instant::now() + timeout;
for handle in &mut handles {
if tokio::time::timeout_at(deadline, &mut *handle)
.await
.is_err()
{
break;
}
}
for handle in handles {
if !handle.is_finished() {
handle.abort();
}
}
}

// ---------------------------------------------------------------------------
// Worker body
// ---------------------------------------------------------------------------
Expand Down Expand Up @@ -2933,6 +2947,20 @@ mod tests {
)
}

#[tokio::test(start_paused = true)]
async fn worker_shutdown_uses_one_shared_deadline() {
let handles = (0..3)
.map(|_| tokio::spawn(std::future::pending()))
.collect();
let shutdown = tokio::spawn(await_worker_shutdown(handles, Duration::from_secs(10)));
tokio::task::yield_now().await;
tokio::time::advance(Duration::from_secs(9)).await;
tokio::task::yield_now().await;
assert!(!shutdown.is_finished());
tokio::time::advance(Duration::from_secs(2)).await;
shutdown.await.unwrap();
}

fn test_job(job_id: &str, root: &std::path::Path) -> NzbJob {
NzbJob {
id: job_id.to_string(),
Expand Down
Loading