Fix flaky test_restart_waits_for_new_workers (#8573)

dask · Mar 12, 2024 · 54ed6a1 · 54ed6a1
1 parent 40daaf0
commit 54ed6a1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/distributed/scheduler.py b/distributed/scheduler.py
@@ -434,7 +434,7 @@ class WorkerState:
     #: Read-only worker status, synced one way from the remote Worker object
     status: Status
 
-    #: Cached hash of :attr:`~WorkerState.address`
+    #: Cached hash of :attr:`~WorkerState.server_id`
     _hash: int
 
     #: The total memory size, in bytes, used by the tasks this worker holds in memory

diff --git a/distributed/tests/test_scheduler.py b/distributed/tests/test_scheduler.py
@@ -1126,9 +1126,9 @@ async def test_restart_waits_for_new_workers(c, s, *workers):
     # NOTE: == for `psutil.Process` compares PID and creation time
     new_procs = {n.process.process for n in workers}
     assert new_procs != original_procs
-    # The workers should have new addresses
-    assert s.workers.keys().isdisjoint(original_workers.keys())
-    # The old WorkerState instances should be replaced
+    # Most times, the workers should have new addresses
+    assert s.workers.keys() ^ original_workers.keys()
+    # The old WorkerState instances should have been replaced
     assert set(s.workers.values()).isdisjoint(original_workers.values())