Protect graceful close from deadlocking

dask · May 26, 2021 · 5a71ee0 · 5a71ee0
1 parent 7e3ec5c
commit 5a71ee0
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/distributed/scheduler.py b/distributed/scheduler.py
@@ -3554,7 +3554,7 @@ def __init__(
             "start_task_metadata": self.start_task_metadata,
             "stop_task_metadata": self.stop_task_metadata,
         }
-        shielded_handlers = {"terminate"}
+        shielded_handlers = {"terminate", "retire_workers"}
 
         connection_limit = get_fileno_limit() / 2
 

diff --git a/distributed/worker.py b/distributed/worker.py
@@ -1208,7 +1208,6 @@ async def close(
             if self.status in (
                 Status.closing,
                 Status.closed,
-                Status.closing_gracefully,
             ):
                 await self.finished()
                 return