Skip to content

Transition table as a ClassVar #6331

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

Merged
crusaderky merged 2 commits into from
May 13, 2022
Merged

Transition table as a ClassVar #6331

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b3ca1a4
Transition table as a ClassVar
crusaderky May 12, 2022
d31acda
code review
crusaderky May 13, 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
118 changes: 63 additions & 55 deletions distributed/scheduler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
Hashable,
Iterable,
Iterator,
Mapping,
Set,
)
from contextlib import suppress
Expand Down Expand Up @@ -1256,7 +1257,6 @@ class SchedulerState:
"replicated_tasks",
"total_nthreads",
"total_occupancy",
"transitions_table",
"unknown_durations",
"unrunnable",
"validate",
Expand Down Expand Up @@ -1308,23 +1308,6 @@ def __init__(
self.task_metadata = {} # type: ignore
self.total_nthreads = 0
self.total_occupancy = 0.0
self.transitions_table = {
("released", "waiting"): self.transition_released_waiting,
("waiting", "released"): self.transition_waiting_released,
("waiting", "processing"): self.transition_waiting_processing,
("waiting", "memory"): self.transition_waiting_memory,
("processing", "released"): self.transition_processing_released,
("processing", "memory"): self.transition_processing_memory,
("processing", "erred"): self.transition_processing_erred,
("no-worker", "released"): self.transition_no_worker_released,
("no-worker", "waiting"): self.transition_no_worker_waiting,
("no-worker", "memory"): self.transition_no_worker_memory,
("released", "forgotten"): self.transition_released_forgotten,
("memory", "forgotten"): self.transition_memory_forgotten,
("erred", "released"): self.transition_erred_released,
("memory", "released"): self.transition_memory_released,
("released", "erred"): self.transition_released_erred,
}
self.unknown_durations: dict[str, set[TaskState]] = {}
self.unrunnable = unrunnable
self.validate = validate
Expand Down Expand Up @@ -1457,27 +1440,26 @@ def _transition(self, key, finish: str, stimulus_id: str, *args, **kwargs):
dependents = set(ts.dependents)
dependencies = set(ts.dependencies)

start_finish = (start, finish)
func = self.transitions_table.get(start_finish)
func = self._TRANSITIONS_TABLE.get((start, finish))
if func is not None:
recommendations, client_msgs, worker_msgs = func(
key, stimulus_id, *args, **kwargs
self, key, stimulus_id, *args, **kwargs
) # type: ignore

elif "released" not in start_finish:
assert not args and not kwargs, (args, kwargs, start_finish)
elif "released" not in (start, finish):
assert not args and not kwargs, (args, kwargs, start, finish)
a_recs: dict
a_cmsgs: dict
a_wmsgs: dict
a: tuple = self._transition(key, "released", stimulus_id)
a_recs, a_cmsgs, a_wmsgs = a

v = a_recs.get(key, finish)
func = self.transitions_table["released", v]
func = self._TRANSITIONS_TABLE["released", v]
b_recs: dict
b_cmsgs: dict
b_wmsgs: dict
b: tuple = func(key, stimulus_id) # type: ignore
b: tuple = func(self, key, stimulus_id) # type: ignore
b_recs, b_cmsgs, b_wmsgs = b

recommendations.update(a_recs)
Expand Down Expand Up @@ -1510,7 +1492,7 @@ def _transition(self, key, finish: str, stimulus_id: str, *args, **kwargs):

start = "released"
else:
raise RuntimeError("Impossible transition from %r to %r" % start_finish)
raise RuntimeError(f"Impossible transition from {start} to {finish}")

if not stimulus_id:
stimulus_id = STIMULUS_ID_UNSET
Expand Down Expand Up @@ -1849,32 +1831,6 @@ def decide_worker(self, ts: TaskState) -> WorkerState | None:

return ws

def set_duration_estimate(self, ts: TaskState, ws: WorkerState) -> float:
Copy link
Collaborator Author

@crusaderky crusaderky May 12, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is just a cut-paste out of the transitions section, as this is not a transition-specific method

"""Estimate task duration using worker state and task state.

If a task takes longer than twice the current average duration we
estimate the task duration to be 2x current-runtime, otherwise we set it
to be the average duration.

See also ``_remove_from_processing``
"""
exec_time: float = ws.executing.get(ts, 0)
duration: float = self.get_task_duration(ts)
total_duration: float
if exec_time > 2 * duration:
total_duration = 2 * exec_time
else:
comm: float = self.get_comm_cost(ts, ws)
total_duration = duration + comm
old = ws.processing.get(ts, 0)
ws.processing[ts] = total_duration

if ts not in ws.long_running:
self.total_occupancy += total_duration - old
ws.occupancy += total_duration - old

return total_duration

def transition_waiting_processing(self, key, stimulus_id):
try:
ts: TaskState = self.tasks[key]
Expand Down Expand Up @@ -2436,7 +2392,7 @@ def transition_no_worker_released(self, key, stimulus_id):
pdb.set_trace()
raise

def remove_key(self, key):
def _remove_key(self, key):
ts: TaskState = self.tasks.pop(key)
assert ts.state == "forgotten"
self.unrunnable.discard(ts)
Expand Down Expand Up @@ -2479,7 +2435,7 @@ def transition_memory_forgotten(self, key, stimulus_id):
_propagate_forgotten(self, ts, recommendations, worker_msgs, stimulus_id)

client_msgs = _task_to_client_msgs(ts)
self.remove_key(key)
self._remove_key(key)

return recommendations, client_msgs, worker_msgs
except Exception as e:
Expand Down Expand Up @@ -2517,7 +2473,7 @@ def transition_released_forgotten(self, key, stimulus_id):
_propagate_forgotten(self, ts, recommendations, worker_msgs, stimulus_id)

client_msgs = _task_to_client_msgs(ts)
self.remove_key(key)
self._remove_key(key)

return recommendations, client_msgs, worker_msgs
except Exception as e:
Expand All @@ -2528,10 +2484,62 @@ def transition_released_forgotten(self, key, stimulus_id):
pdb.set_trace()
raise

# {
# (start, finish):
# transition_<start>_<finish>(
# self, key: str, stimulus_id: str, *args, **kwargs
# ) -> (recommendations, client_msgs, worker_msgs)
# }
_TRANSITIONS_TABLE: ClassVar[
Mapping[tuple[str, str], Callable[..., tuple[dict, dict, dict]]]
] = {
("released", "waiting"): transition_released_waiting,
("waiting", "released"): transition_waiting_released,
("waiting", "processing"): transition_waiting_processing,
("waiting", "memory"): transition_waiting_memory,
("processing", "released"): transition_processing_released,
("processing", "memory"): transition_processing_memory,
("processing", "erred"): transition_processing_erred,
("no-worker", "released"): transition_no_worker_released,
("no-worker", "waiting"): transition_no_worker_waiting,
("no-worker", "memory"): transition_no_worker_memory,
("released", "forgotten"): transition_released_forgotten,
("memory", "forgotten"): transition_memory_forgotten,
("erred", "released"): transition_erred_released,
("memory", "released"): transition_memory_released,
("released", "erred"): transition_released_erred,
}

##############################
# Assigning Tasks to Workers #
##############################

def set_duration_estimate(self, ts: TaskState, ws: WorkerState) -> float:
"""Estimate task duration using worker state and task state.

If a task takes longer than twice the current average duration we
estimate the task duration to be 2x current-runtime, otherwise we set it
to be the average duration.

See also ``_remove_from_processing``
"""
exec_time: float = ws.executing.get(ts, 0)
duration: float = self.get_task_duration(ts)
total_duration: float
if exec_time > 2 * duration:
total_duration = 2 * exec_time
else:
comm: float = self.get_comm_cost(ts, ws)
total_duration = duration + comm
old = ws.processing.get(ts, 0)
ws.processing[ts] = total_duration

if ts not in ws.long_running:
self.total_occupancy += total_duration - old
ws.occupancy += total_duration - old

return total_duration

def check_idle_saturated(self, ws: WorkerState, occ: float = -1.0):
"""Update the status of the idle and saturated state

Expand Down
Loading