Skip to content

Edge worker maintenance state is remembered if worker crashes #50338

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
jscheffl merged 3 commits into from
May 8, 2025
Merged

Edge worker maintenance state is remembered if worker crashes #50338

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
feb85a4
Edge worker maintenance state is remembered if worker crashes
May 8, 2025
9a22050
Add pytests
May 8, 2025
176ab3a
Consolidate code
May 8, 2025
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
18 changes: 16 additions & 2 deletions providers/edge3/src/airflow/providers/edge3/executors/edge_executor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,11 @@ def _check_worker_liveness(self, session: Session) -> bool:
.with_for_update(skip_locked=True)
.filter(
EdgeWorkerModel.state.not_in(
[EdgeWorkerState.UNKNOWN, EdgeWorkerState.OFFLINE, EdgeWorkerState.OFFLINE_MAINTENANCE]
[
EdgeWorkerState.UNKNOWN,
EdgeWorkerState.OFFLINE,
EdgeWorkerState.OFFLINE_MAINTENANCE,
]
),
EdgeWorkerModel.last_update < (timezone.utcnow() - timedelta(seconds=heartbeat_interval * 5)),
)
Expand All @@ -186,7 +190,17 @@ def _check_worker_liveness(self, session: Session) -> bool:

for worker in lifeless_workers:
changed = True
worker.state = EdgeWorkerState.UNKNOWN
# If the worker dies in maintenance mode we want to remember it, so it can start in maintenance mode
worker.state = (
EdgeWorkerState.OFFLINE_MAINTENANCE
if worker.state
in (
EdgeWorkerState.MAINTENANCE_MODE,
EdgeWorkerState.MAINTENANCE_PENDING,
EdgeWorkerState.MAINTENANCE_REQUEST,
)
else EdgeWorkerState.UNKNOWN
)
reset_metrics(worker.worker_name)

return changed
Expand Down
7 changes: 6 additions & 1 deletion providers/edge3/src/airflow/providers/edge3/worker_api/routes/worker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,12 @@ def redefine_state(worker_state: EdgeWorkerState, body_state: EdgeWorkerState) -
EdgeWorkerState.MAINTENANCE_PENDING,
EdgeWorkerState.MAINTENANCE_MODE,
)
or worker_state == EdgeWorkerState.OFFLINE_MAINTENANCE
or worker_state
in (
EdgeWorkerState.OFFLINE_MAINTENANCE,
EdgeWorkerState.MAINTENANCE_MODE,
EdgeWorkerState.MAINTENANCE_PENDING,
)
and body_state == EdgeWorkerState.STARTING
):
return EdgeWorkerState.MAINTENANCE_REQUEST
Expand Down
18 changes: 18 additions & 0 deletions providers/edge3/tests/unit/edge3/worker_api/routes/test_worker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,24 @@ def test_register(self, session: Session, input_queues: list[str] | None, cli_wo
EdgeWorkerState.MAINTENANCE_REQUEST,
id="maintenance_starting",
),
pytest.param(
EdgeWorkerState.MAINTENANCE_MODE,
EdgeWorkerState.STARTING,
EdgeWorkerState.MAINTENANCE_REQUEST,
id="maintenance_crash",
),
pytest.param(
EdgeWorkerState.MAINTENANCE_PENDING,
EdgeWorkerState.STARTING,
EdgeWorkerState.MAINTENANCE_REQUEST,
id="maintenance_crash_2",
),
pytest.param(
EdgeWorkerState.MAINTENANCE_REQUEST,
EdgeWorkerState.STARTING,
EdgeWorkerState.MAINTENANCE_REQUEST,
id="maintenance_crash_3",
),
],
)
def test_redefine_state(
Expand Down