From 6cd0cfdbc7b69a48e391afa71f65b4bedf4d9eb7 Mon Sep 17 00:00:00 2001
From: MrVampy <4302946+MrVampy@users.noreply.github.com>
Date: Wed, 2 Sep 2026 21:37:40 +0200
Subject: [PATCH] fix: bound worker shutdown to one deadline

(cherry picked from commit ec279d781f871e4f91329f26acc058daee70f861)
---
 crates/nzb-dispatch/src/download_engine.rs | 36 +++++++++++++++++++---
 1 file changed, 32 insertions(+), 4 deletions(-)

diff --git a/crates/nzb-dispatch/src/download_engine.rs b/crates/nzb-dispatch/src/download_engine.rs
index 502b7ac..eaf9acc 100644
--- a/crates/nzb-dispatch/src/download_engine.rs
+++ b/crates/nzb-dispatch/src/download_engine.rs
@@ -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();
@@ -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
 // ---------------------------------------------------------------------------
@@ -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(),