Skip to content

[Edge] Make edge executor db access multi instance save #44716

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 1 commit into from
Dec 6, 2024
Merged

[Edge] Make edge executor db access multi instance save #44716

Show file tree
Hide file tree
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
8 changes: 8 additions & 0 deletions providers/src/airflow/providers/edge/CHANGELOG.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,14 @@
Changelog
---------

0.9.1pre0
.........

Misc
~~~~

* ``Make edge executor DB access is multi instance save.``

0.9.0pre0
.........

Expand Down
2 changes: 1 addition & 1 deletion providers/src/airflow/providers/edge/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

__all__ = ["__version__"]

__version__ = "0.9.0pre0"
__version__ = "0.9.1pre0"

if packaging.version.parse(packaging.version.parse(airflow_version).base_version) < packaging.version.parse(
"2.10.0"
Expand Down
3 changes: 3 additions & 0 deletions providers/src/airflow/providers/edge/executors/edge_executor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,7 @@ def _check_worker_liveness(self, session: Session) -> bool:
heartbeat_interval: int = conf.getint("edge", "heartbeat_interval")
lifeless_workers: list[EdgeWorkerModel] = (
session.query(EdgeWorkerModel)
.with_for_update(skip_locked=True)
.filter(
EdgeWorkerModel.state.not_in([EdgeWorkerState.UNKNOWN, EdgeWorkerState.OFFLINE]),
EdgeWorkerModel.last_update < (timezone.utcnow() - timedelta(seconds=heartbeat_interval * 5)),
Expand All @@ -154,6 +155,7 @@ def _update_orphaned_jobs(self, session: Session) -> bool:
heartbeat_interval: int = conf.getint("scheduler", "scheduler_zombie_task_threshold")
lifeless_jobs: list[EdgeJobModel] = (
session.query(EdgeJobModel)
.with_for_update(skip_locked=True)
.filter(
EdgeJobModel.state == TaskInstanceState.RUNNING,
EdgeJobModel.last_update < (timezone.utcnow() - timedelta(seconds=heartbeat_interval)),
Expand All @@ -180,6 +182,7 @@ def _purge_jobs(self, session: Session) -> bool:
job_fail_purge = conf.getint("edge", "job_fail_purge")
jobs: list[EdgeJobModel] = (
session.query(EdgeJobModel)
.with_for_update(skip_locked=True)
.filter(
EdgeJobModel.state.in_(
[
Expand Down
2 changes: 1 addition & 1 deletion providers/src/airflow/providers/edge/provider.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ source-date-epoch: 1729683247

# note that those versions are maintained by release manager - do not update them manually
versions:
- 0.9.0pre0
- 0.9.1pre0

dependencies:
- apache-airflow>=2.10.0
Expand Down