Skip to content

Extract SchedulerState from Scheduler #5839

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

Closed
jakirkham wants to merge 14 commits into from
Closed

Extract SchedulerState from Scheduler #5839

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
6184928
Extract SchedulerState from Scheduler
martindurant Feb 19, 2022
0d3d773
Merge dask/main into jakirkham/cy_scheduler_state_2
jakirkham Feb 23, 2022
359915d
Use `bool` instead of `not not`
jakirkham Feb 23, 2022
47ee126
More test fixes
jakirkham Feb 23, 2022
d4334cb
Merge dask/main into jakirkham/cy_scheduler_state_2
jakirkham Feb 24, 2022
e483d59
Merge dask/main into jakirkham/cy_scheduler_state_2
jakirkham Feb 24, 2022
0410c93
Merge dask/main into jakirkham/cy_scheduler_state_2
jakirkham Feb 26, 2022
6849761
Fix `test_long_running_not_in_occupancy`
jakirkham Feb 26, 2022
e798f96
Add back missing `if`
jakirkham Feb 28, 2022
99d9190
Grab `transition_log` from `SchedulerState`
jakirkham Feb 28, 2022
a060153
Grab `replicated_tasks` from `SchedulerState`
jakirkham Feb 28, 2022
d2ba120
Grab `running` from `SchedulerState`
jakirkham Feb 28, 2022
62f57ba
Move cached `MEMORY_*` config vars to Scheduler
jakirkham Mar 1, 2022
4f02566
Convert functions on `SchedulerState` to methods
jakirkham Mar 1, 2022
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
8 changes: 4 additions & 4 deletions distributed/active_memory_manager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,10 +222,10 @@ def log_reject(msg: str) -> None:
return None

if candidates is None:
candidates = self.scheduler.running.copy()
candidates = self.scheduler.state.running.copy()
else:
# Don't modify orig_candidates
candidates = candidates & self.scheduler.running
candidates = candidates & self.scheduler.state.running
if not candidates:
log_reject("no running candidates")
return None
Expand Down Expand Up @@ -467,7 +467,7 @@ def run(self):
nkeys = 0
ndrop = 0

for ts in self.manager.scheduler.replicated_tasks:
for ts in self.manager.scheduler.state.replicated_tasks:
desired_replicas = 1 # TODO have a marker on TaskState

# If a dependent task has not been assigned to a worker yet, err on the side
Expand Down Expand Up @@ -591,7 +591,7 @@ def run(self):
drop_ws = (yield "drop", ts, {ws})
if drop_ws:
continue # Use case 1 or 2
if ts.who_has & self.manager.scheduler.running:
if ts.who_has & self.manager.scheduler.state.running:
continue # Use case 3 or 4
# Use case 5

Expand Down
Loading