polish

distributed/scheduler.py

@@ -2090,9 +2090,6 @@ def decide_worker_rootish_queuing_disabled(
             returns None, in which case the task should be transitioned to
             ``no-worker``.
         """
-        print(
-            f"decide_worker_rootish_queuing_disabled({ts.key}) tg={ts.group} lws={ts.group.last_worker}"
-        )
         if self.validate:
             # See root-ish-ness note below in `decide_worker_rootish_queuing_enabled`
             assert math.isinf(self.WORKER_SATURATION)
@@ -2111,7 +2108,8 @@ def decide_worker_rootish_queuing_disabled(
         ):
             ws = lws
         else:
-            # Last-used worker is full, unknown, or non-running; pick a new worker for the next few tasks
+            # Last-used worker is full, unknown, retiring, or paused;
+            # pick a new worker for the next few tasks
             ws = min(pool, key=partial(self.worker_objective, ts))
             tg.last_worker_tasks_left = math.floor(
                 (len(tg) / self.total_nthreads) * ws.nthreads

distributed/tests/test_scheduler.py

@@ -258,7 +258,6 @@ def random(**kwargs):
     client=True,
     nthreads=[("", 1)],
     config={"distributed.scheduler.work-stealing": False},
-    timeout=3,
 )
 async def test_decide_worker_rootish_while_last_worker_is_retiring(c, s, a):
     """https://github.com/dask/distributed/issues/7063"""
@@ -311,7 +310,7 @@ async def test_decide_worker_rootish_while_last_worker_is_retiring(c, s, a):
         # not a running worker, so we must choose b
         await evx[1].set()
         await wait_for_state("y-2", "processing", s)
-        await wait_for_state("y-2", "waiting", b)
+        await wait_for_state("y-2", "waiting", b)  # x-1 is in memory on a
 
         # Cleanup
         b.block_gather_dep.set()