You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airflow.apache.org by "Lee-W (via GitHub)" <gi...@apache.org> on 2026/01/19 10:43:44 UTC
[PR] Lock adpr [airflow]
Lee-W opened a new pull request, #60773:
URL: https://github.com/apache/airflow/pull/60773
<!--
Thank you for contributing!
Please provide above a brief description of the changes made in this pull request.
Write a good git commit message following this guide: http://chris.beams.io/posts/git-commit/
Please make sure that your code changes are covered with tests.
And in case of new features or big changes remember to adjust the documentation.
Feel free to ping (in general) for the review if you do not see reaction for a few days
(72 Hours is the minimum reaction time you can expect from volunteers) - we sometimes miss notifications.
In case of an existing issue, reference it using one of the following:
* closes: #ISSUE
* related: #ISSUE
-->
---
##### Was generative AI tooling used to co-author this PR?
<!--
If generative AI tooling has been used in the process of authoring this PR, please
change below checkbox to `[X]` followed by the name of the tool, uncomment the "Generated-by".
-->
- [ ] Yes (please specify the tool below)
<!--
Generated-by: [Tool Name] following [the guidelines](https://github.com/apache/airflow/blob/main/contributing-docs/05_pull_requests.rst#gen-ai-assisted-contributions)
-->
---
* Read the **[Pull Request Guidelines](https://github.com/apache/airflow/blob/main/contributing-docs/05_pull_requests.rst#pull-request-guidelines)** for more information. Note: commit author/co-author name and email in commits become permanently public when merged.
* For fundamental code changes, an Airflow Improvement Proposal ([AIP](https://cwiki.apache.org/confluence/display/AIRFLOW/Airflow+Improvement+Proposals)) is needed.
* When adding dependency, check compliance with the [ASF 3rd Party License Policy](https://www.apache.org/legal/resolved.html#category-x).
* For significant user-facing changes create newsfragment: `{pr_number}.significant.rst` or `{issue_number}.significant.rst`, in [airflow-core/newsfragments](https://github.com/apache/airflow/tree/main/airflow-core/newsfragments).
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@airflow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Add row lock to ADRQ before Dag run creation [airflow]
Posted by "uranusjr (via GitHub)" <gi...@apache.org>.
uranusjr commented on code in PR #60773:
URL: https://github.com/apache/airflow/pull/60773#discussion_r2887418199
##########
airflow-core/src/airflow/jobs/scheduler_job_runner.py:
##########
@@ -2135,26 +2135,44 @@ def _create_dag_runs_asset_triggered(
triggered_date_by_dag: dict[str, datetime],
session: Session,
) -> None:
- """For DAGs that are triggered by assets, create dag runs."""
- triggered_dates: dict[str, DateTime] = {
- dag_id: timezone.coerce_datetime(last_asset_event_time)
- for dag_id, last_asset_event_time in triggered_date_by_dag.items()
- }
-
+ """For Dags that are triggered by assets, create Dag runs."""
for dag_model in dag_models:
+ if dag_model.dag_id not in triggered_date_by_dag:
+ continue
dag = self._get_current_dag(dag_id=dag_model.dag_id, session=session)
if not dag:
- self.log.error("DAG '%s' not found in serialized_dag table", dag_model.dag_id)
+ self.log.error("Dag '%s' not found in serialized_dag table", dag_model.dag_id)
continue
if not isinstance(dag.timetable, AssetTriggeredTimetable):
self.log.error(
- "DAG '%s' was asset-scheduled, but didn't have an AssetTriggeredTimetable!",
+ "Dag '%s' was asset-scheduled, but didn't have an AssetTriggeredTimetable!",
dag_model.dag_id,
)
continue
- triggered_date = triggered_dates[dag.dag_id]
+ queued_adrqs = list(
+ session.scalars(
+ with_row_locks(
+ select(AssetDagRunQueue).where(AssetDagRunQueue.target_dag_id == dag.dag_id),
+ of=AssetDagRunQueue,
+ skip_locked=True,
+ key_share=False,
+ session=session,
+ )
+ )
+ )
+ # If another scheduler already locked these ADRQ rows, SKIP LOCKED makes this scheduler skip them.
+ if not queued_adrqs:
+ self.log.debug(
+ "Skipping asset-triggered DagRun creation for Dag '%s'; no queued assets remain.",
+ dag.dag_id,
+ )
+ continue
+
+ triggered_date: DateTime = timezone.coerce_datetime(
+ max(record.created_at for record in queued_adrqs)
Review Comment:
Instead of `max()`, maybe the previous query can have an `order_by()` so this can simply do `[0]`?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@airflow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Add row lock to ADRQ before Dag run creation [airflow]
Posted by "jason810496 (via GitHub)" <gi...@apache.org>.
jason810496 commented on code in PR #60773:
URL: https://github.com/apache/airflow/pull/60773#discussion_r2938019912
##########
airflow-core/src/airflow/jobs/scheduler_job_runner.py:
##########
@@ -2016,26 +2016,42 @@ def _create_dag_runs_asset_triggered(
triggered_date_by_dag: dict[str, datetime],
session: Session,
) -> None:
- """For DAGs that are triggered by assets, create dag runs."""
- triggered_dates: dict[str, DateTime] = {
- dag_id: timezone.coerce_datetime(last_asset_event_time)
- for dag_id, last_asset_event_time in triggered_date_by_dag.items()
- }
-
+ """For Dags that are triggered by assets, create Dag runs."""
for dag_model in dag_models:
+ if dag_model.dag_id not in triggered_date_by_dag:
+ continue
Review Comment:
Based on the caller context: https://github.com/apache/airflow/blob/a89dcaa46dcf7d1cc1a4e2291da87c90f5541bf6/airflow-core/src/airflow/jobs/scheduler_job_runner.py#L1823-L1847
It seems the new added `if dag_model.dag_id not in triggered_date_by_dag` is redundant?
```python
asset_triggered_dags = [d for d in all_dags_needing_dag_runs if d.dag_id in triggered_date_by_dag]
# ...
self._create_dag_runs_asset_triggered(
dag_models=[d for d in asset_triggered_dags if d.dag_id not in partition_dag_ids],
```
##########
airflow-core/src/airflow/jobs/scheduler_job_runner.py:
##########
@@ -2016,26 +2016,42 @@ def _create_dag_runs_asset_triggered(
triggered_date_by_dag: dict[str, datetime],
session: Session,
) -> None:
- """For DAGs that are triggered by assets, create dag runs."""
- triggered_dates: dict[str, DateTime] = {
- dag_id: timezone.coerce_datetime(last_asset_event_time)
- for dag_id, last_asset_event_time in triggered_date_by_dag.items()
- }
-
+ """For Dags that are triggered by assets, create Dag runs."""
for dag_model in dag_models:
+ if dag_model.dag_id not in triggered_date_by_dag:
+ continue
Review Comment:
Now the `triggered_date` will be handled by the last `queued_adrqs` statement.
So it _seems_ we don't even need to pass `triggered_date_by_dag` to `_create_dag_runs_asset_triggered` as `triggered_date_by_dag` was only used in previous version to calcaute `triggered_dates` for each dag_id.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@airflow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Add row lock to ADRQ before Dag run creation [airflow]
Posted by "Lee-W (via GitHub)" <gi...@apache.org>.
Lee-W merged PR #60773:
URL: https://github.com/apache/airflow/pull/60773
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@airflow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Add row lock to ADRQ before Dag run creation [airflow]
Posted by "Lee-W (via GitHub)" <gi...@apache.org>.
Lee-W commented on code in PR #60773:
URL: https://github.com/apache/airflow/pull/60773#discussion_r2887412962
##########
airflow-core/src/airflow/jobs/scheduler_job_runner.py:
##########
@@ -2135,26 +2135,44 @@ def _create_dag_runs_asset_triggered(
triggered_date_by_dag: dict[str, datetime],
session: Session,
) -> None:
- """For DAGs that are triggered by assets, create dag runs."""
- triggered_dates: dict[str, DateTime] = {
- dag_id: timezone.coerce_datetime(last_asset_event_time)
- for dag_id, last_asset_event_time in triggered_date_by_dag.items()
- }
-
+ """For Dags that are triggered by assets, create Dag runs."""
for dag_model in dag_models:
+ if dag_model.dag_id not in triggered_date_by_dag:
+ continue
dag = self._get_current_dag(dag_id=dag_model.dag_id, session=session)
if not dag:
- self.log.error("DAG '%s' not found in serialized_dag table", dag_model.dag_id)
+ self.log.error("Dag '%s' not found in serialized_dag table", dag_model.dag_id)
continue
if not isinstance(dag.timetable, AssetTriggeredTimetable):
self.log.error(
- "DAG '%s' was asset-scheduled, but didn't have an AssetTriggeredTimetable!",
+ "Dag '%s' was asset-scheduled, but didn't have an AssetTriggeredTimetable!",
dag_model.dag_id,
)
continue
- triggered_date = triggered_dates[dag.dag_id]
+ queued_adrqs = list(
Review Comment:
updated
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@airflow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Add row lock to ADRQ before Dag run creation [airflow]
Posted by "Lee-W (via GitHub)" <gi...@apache.org>.
Lee-W commented on PR #60773:
URL: https://github.com/apache/airflow/pull/60773#issuecomment-3990709918
would be nice if we can make it part of 3.1.8
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@airflow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Add row lock to ADRQ before Dag run creation [airflow]
Posted by "uranusjr (via GitHub)" <gi...@apache.org>.
uranusjr commented on code in PR #60773:
URL: https://github.com/apache/airflow/pull/60773#discussion_r2887401433
##########
airflow-core/src/airflow/jobs/scheduler_job_runner.py:
##########
@@ -2135,26 +2135,44 @@ def _create_dag_runs_asset_triggered(
triggered_date_by_dag: dict[str, datetime],
session: Session,
) -> None:
- """For DAGs that are triggered by assets, create dag runs."""
- triggered_dates: dict[str, DateTime] = {
- dag_id: timezone.coerce_datetime(last_asset_event_time)
- for dag_id, last_asset_event_time in triggered_date_by_dag.items()
- }
-
+ """For Dags that are triggered by assets, create Dag runs."""
for dag_model in dag_models:
+ if dag_model.dag_id not in triggered_date_by_dag:
+ continue
dag = self._get_current_dag(dag_id=dag_model.dag_id, session=session)
if not dag:
- self.log.error("DAG '%s' not found in serialized_dag table", dag_model.dag_id)
+ self.log.error("Dag '%s' not found in serialized_dag table", dag_model.dag_id)
continue
if not isinstance(dag.timetable, AssetTriggeredTimetable):
self.log.error(
- "DAG '%s' was asset-scheduled, but didn't have an AssetTriggeredTimetable!",
+ "Dag '%s' was asset-scheduled, but didn't have an AssetTriggeredTimetable!",
dag_model.dag_id,
)
continue
- triggered_date = triggered_dates[dag.dag_id]
+ queued_adrqs = list(
Review Comment:
Use `.all()` instead
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@airflow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Add row lock to ADRQ before Dag run creation [airflow]
Posted by "github-actions[bot] (via GitHub)" <gi...@apache.org>.
github-actions[bot] commented on PR #60773:
URL: https://github.com/apache/airflow/pull/60773#issuecomment-4072114170
### Backport failed to create: v3-1-test. View the failure log <a href='https://github.com/apache/airflow/actions/runs/23177184572'> Run details </a>
Note: As of [Merging PRs targeted for Airflow 3.X](https://github.com/apache/airflow/blob/main/dev/README_AIRFLOW3_DEV.md#merging-prs-targeted-for-airflow-3x)
the committer who merges the PR is responsible for backporting the PRs that are bug fixes (generally speaking) to the maintenance branches.
In matter of doubt please ask in [#release-management](https://apache-airflow.slack.com/archives/C03G9H97MM2) Slack channel.
<table>
<tr>
<th>Status</th>
<th>Branch</th>
<th>Result</th>
</tr>
<tr>
<td>❌</td>
<td>v3-1-test</td>
<td><a href="https://github.com/apache/airflow/commit/b3055d7bb8cea89a77d7179b8896b84bac29de77"><img src='https://img.shields.io/badge/Commit-b3055d7-red' alt='Commit Link'></a></td>
</tr>
</table>
You can attempt to backport this manually by running:
```bash
cherry_picker b3055d7 v3-1-test
```
This should apply the commit to the v3-1-test branch and leave the commit in conflict state marking
the files that need manual conflict resolution.
After you have resolved the conflicts, you can continue the backport process by running:
```bash
cherry_picker --continue
```
If you don't have cherry-picker installed, see the [installation guide](https://github.com/apache/airflow/blob/main/dev/README_AIRFLOW3_DEV.md#how-to-backport-pr-with-cherry-picker-cli).
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@airflow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Add row lock to ADRQ before Dag run creation [airflow]
Posted by "Lee-W (via GitHub)" <gi...@apache.org>.
Lee-W commented on code in PR #60773:
URL: https://github.com/apache/airflow/pull/60773#discussion_r2889124559
##########
airflow-core/src/airflow/jobs/scheduler_job_runner.py:
##########
@@ -2135,26 +2135,44 @@ def _create_dag_runs_asset_triggered(
triggered_date_by_dag: dict[str, datetime],
session: Session,
) -> None:
- """For DAGs that are triggered by assets, create dag runs."""
- triggered_dates: dict[str, DateTime] = {
- dag_id: timezone.coerce_datetime(last_asset_event_time)
- for dag_id, last_asset_event_time in triggered_date_by_dag.items()
- }
-
+ """For Dags that are triggered by assets, create Dag runs."""
for dag_model in dag_models:
+ if dag_model.dag_id not in triggered_date_by_dag:
+ continue
dag = self._get_current_dag(dag_id=dag_model.dag_id, session=session)
if not dag:
- self.log.error("DAG '%s' not found in serialized_dag table", dag_model.dag_id)
+ self.log.error("Dag '%s' not found in serialized_dag table", dag_model.dag_id)
continue
if not isinstance(dag.timetable, AssetTriggeredTimetable):
self.log.error(
- "DAG '%s' was asset-scheduled, but didn't have an AssetTriggeredTimetable!",
+ "Dag '%s' was asset-scheduled, but didn't have an AssetTriggeredTimetable!",
dag_model.dag_id,
)
continue
- triggered_date = triggered_dates[dag.dag_id]
+ queued_adrqs = list(
+ session.scalars(
+ with_row_locks(
+ select(AssetDagRunQueue).where(AssetDagRunQueue.target_dag_id == dag.dag_id),
+ of=AssetDagRunQueue,
+ skip_locked=True,
+ key_share=False,
+ session=session,
+ )
+ )
+ )
+ # If another scheduler already locked these ADRQ rows, SKIP LOCKED makes this scheduler skip them.
+ if not queued_adrqs:
+ self.log.debug(
+ "Skipping asset-triggered DagRun creation for Dag '%s'; no queued assets remain.",
+ dag.dag_id,
+ )
+ continue
+
+ triggered_date: DateTime = timezone.coerce_datetime(
+ max(record.created_at for record in queued_adrqs)
Review Comment:
yep, just update it
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@airflow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Add row lock to ADRQ before Dag run creation [airflow]
Posted by "Lee-W (via GitHub)" <gi...@apache.org>.
Lee-W commented on code in PR #60773:
URL: https://github.com/apache/airflow/pull/60773#discussion_r2939265065
##########
airflow-core/src/airflow/jobs/scheduler_job_runner.py:
##########
@@ -2016,26 +2016,42 @@ def _create_dag_runs_asset_triggered(
triggered_date_by_dag: dict[str, datetime],
session: Session,
) -> None:
- """For DAGs that are triggered by assets, create dag runs."""
- triggered_dates: dict[str, DateTime] = {
- dag_id: timezone.coerce_datetime(last_asset_event_time)
- for dag_id, last_asset_event_time in triggered_date_by_dag.items()
- }
-
+ """For Dags that are triggered by assets, create Dag runs."""
for dag_model in dag_models:
+ if dag_model.dag_id not in triggered_date_by_dag:
+ continue
Review Comment:
yep, makes sense. Just removed it. Please take another look when you have a chance. Thanks!
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@airflow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Add row lock to ADRQ before Dag run creation [airflow]
Posted by "hussein-awala (via GitHub)" <gi...@apache.org>.
hussein-awala commented on PR #60773:
URL: https://github.com/apache/airflow/pull/60773#issuecomment-4113882344
I encountered this exact race condition in production on 3.1.7 — two schedulers both read the ADRQ before either committed, resulting in duplicate asset-triggered DagRuns with the same `run_after` timestamp. Independently traced it to the missing row lock on ADRQ in `_create_dag_runs_asset_triggered`. Thanks for the fix!
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@airflow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org