Skip to content

Apply dag_id filter when updating backfill details in dag_run #50577

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
vatsrahul1001 merged 4 commits into from
May 14, 2025
Merged

Apply dag_id filter when updating backfill details in dag_run #50577

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
277b661
Filter query to update the dag_run table with backfill details, using…
vatsrahul1001 May 14, 2025
8df3681
Merge branch 'main' into fix-backfills
vatsrahul1001 May 14, 2025
6d75081
Merge branch 'main' into fix-backfills
vatsrahul1001 May 14, 2025
89d88bd
Merge branch 'main' into fix-backfills
vatsrahul1001 May 14, 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
7 changes: 5 additions & 2 deletions airflow-core/src/airflow/models/backfill.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,10 @@ def _create_backfill_dag_run(
return
lock = session.execute(
with_row_locks(
query=select(DagRun).where(DagRun.logical_date == info.logical_date),
query=select(DagRun).where(
DagRun.logical_date == info.logical_date,
DagRun.dag_id == dag.dag_id,
),
session=session,
skip_locked=True,
)
Expand Down Expand Up @@ -410,7 +413,7 @@ def _handle_clear_run(session, dag, dr, info, backfill_id, sort_ordinal):
# Update backfill_id and run_type in DagRun table
session.execute(
update(DagRun)
.where(DagRun.logical_date == info.logical_date)
.where(DagRun.logical_date == info.logical_date, DagRun.dag_id == dag.dag_id)
.values(
backfill_id=backfill_id,
run_type=DagRunType.BACKFILL_JOB,
Expand Down
2 changes: 1 addition & 1 deletion airflow-core/tests/unit/models/test_backfill.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,7 @@ def test_reprocess_behavior(reprocess_behavior, num_in_b, exc_reasons, dag_maker
query = (
select(DagRun)
.join(BackfillDagRun.dag_run)
.where(BackfillDagRun.backfill_id == b.id)
.where(BackfillDagRun.backfill_id == b.id, DagRun.dag_id == dag.dag_id)
.order_by(BackfillDagRun.sort_ordinal)
)
# these are all the dag runs that are part of this backfill
Expand Down