Skip to content

Don't try to insert queue records if no downstream dag #26257

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
ashb merged 1 commit into from
Sep 9, 2022
Merged

Don't try to insert queue records if no downstream dag #26257

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
7 changes: 3 additions & 4 deletions airflow/datasets/manager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,9 @@ def register_dataset_change(
extra=extra,
)
)
self._queue_dagruns(dataset_model, session)
if dataset_model.consuming_dags:
self._queue_dagruns(dataset_model, session)
session.flush()

def _queue_dagruns(self, dataset: DatasetModel, session: Session) -> None:
# Possible race condition: if multiple dags or multiple (usually
Expand Down Expand Up @@ -91,8 +93,6 @@ def _slow_path_queue_dagruns(self, dataset: DatasetModel, session: Session) -> N
except exc.IntegrityError:
self.log.debug("Skipping record %s", item, exc_info=True)

session.flush()

def _postgres_queue_dagruns(self, dataset: DatasetModel, session: Session) -> None:
from sqlalchemy.dialects.postgresql import insert

Expand All @@ -101,7 +101,6 @@ def _postgres_queue_dagruns(self, dataset: DatasetModel, session: Session) -> No
stmt,
[{'target_dag_id': target_dag.dag_id} for target_dag in dataset.consuming_dags],
)
session.flush()


def resolve_dataset_manager() -> "DatasetManager":
Expand Down
14 changes: 14 additions & 0 deletions tests/datasets/test_manager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,3 +80,17 @@ def test_register_dataset_change(self, session, dag_maker, mock_task_instance):
# Ensure we've created a dataset
assert session.query(DatasetEvent).filter_by(dataset_id=dsm.id).count() == 1
assert session.query(DatasetDagRunQueue).count() == 2

def test_register_dataset_change_no_downstreams(self, session, mock_task_instance):
dsem = DatasetManager()

ds = Dataset(uri="never_consumed")
dsm = DatasetModel(uri="never_consumed")
session.add(dsm)
session.flush()

dsem.register_dataset_change(task_instance=mock_task_instance, dataset=ds, session=session)

# Ensure we've created a dataset
assert session.query(DatasetEvent).filter_by(dataset_id=dsm.id).count() == 1
assert session.query(DatasetDagRunQueue).count() == 0