Skip to content

Fix race condition in Client.scheduler_info #9375

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

Open
TomAugspurger wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix race condition in Client.scheduler_info #9375

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
17 changes: 12 additions & 5 deletions distributed/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1607,13 +1607,14 @@ async def _ensure_connected(self, timeout=None):

async def _update_scheduler_info(self, n_workers=0):
if self.status not in ("running", "connecting") or self.scheduler is None:
return
return self._scheduler_identity
try:
self._scheduler_identity = SchedulerInfo(
await self.scheduler.identity(n_workers=n_workers)
)
info = SchedulerInfo(await self.scheduler.identity(n_workers=n_workers))
except OSError:
logger.debug("Unable to query scheduler for identity")
else:
self._scheduler_identity = info
return self._scheduler_identity

async def _wait_for_workers(
self, n_workers: int, timeout: float | None = None
Expand Down Expand Up @@ -4525,7 +4526,13 @@ def scheduler_info(self, n_workers: int = -1, **kwargs: Any) -> SchedulerInfo:
'time-delay': 0.0061032772064208984}}}
"""
if not self.asynchronous:
self.sync(self._update_scheduler_info, n_workers=n_workers)
# Return the value fetched by this call directly, rather than
# reading back ``self._scheduler_identity``. The periodic
# ``_update_scheduler_info`` callback (which defaults to
# ``n_workers=0``, i.e. no per-worker info) runs on the event loop
# and may overwrite ``self._scheduler_identity`` between the sync
# call completing and our reading the attribute.
return self.sync(self._update_scheduler_info, n_workers=n_workers)
return self._scheduler_identity

def dump_cluster_state(
Expand Down
Loading