Skip to content

[AIRFLOW-5500] Fix the trigger_dag api in the case of nested subdags #8081

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
kaxil merged 2 commits into from
Jun 5, 2020
Merged

[AIRFLOW-5500] Fix the trigger_dag api in the case of nested subdags #8081

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
773011f
don't retrigger nested subdags multiple times
Apr 2, 2020
850ee13
Merge branch 'master' into fix-trigger-dag
Jun 5, 2020
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
9 changes: 3 additions & 6 deletions airflow/api/common/experimental/trigger_dag.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,19 +86,16 @@ def _trigger_dag(
run_conf = json.loads(conf)

triggers = []
dags_to_trigger = [dag]
while dags_to_trigger:
dag = dags_to_trigger.pop()
trigger = dag.create_dagrun(
dags_to_trigger = [dag] + dag.subdags
for _dag in dags_to_trigger:
trigger = _dag.create_dagrun(
run_id=run_id,
execution_date=execution_date,
state=State.RUNNING,
conf=run_conf,
external_trigger=True,
)
triggers.append(trigger)
if dag.subdags:
dags_to_trigger.extend(dag.subdags)
return triggers


Expand Down
25 changes: 25 additions & 0 deletions tests/api/common/experimental/test_trigger_dag.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,31 @@ def test_trigger_dag_include_subdags(self, dag_bag_mock, dag_run_mock, dag_mock)

self.assertEqual(3, len(triggers))

@mock.patch('airflow.models.DAG')
@mock.patch('airflow.models.DagRun')
@mock.patch('airflow.models.DagBag')
def test_trigger_dag_include_nested_subdags(self, dag_bag_mock, dag_run_mock, dag_mock):
dag_id = "trigger_dag"
dag_bag_mock.dags = [dag_id]
dag_bag_mock.get_dag.return_value = dag_mock
dag_run_mock.find.return_value = None
dag1 = mock.MagicMock()
dag1.subdags = []
dag2 = mock.MagicMock()
dag2.subdags = [dag1]
dag_mock.subdags = [dag1, dag2]

triggers = _trigger_dag(
dag_id,
dag_bag_mock,
dag_run_mock,
run_id=None,
conf=None,
execution_date=None,
replace_microseconds=True)

self.assertEqual(3, len(triggers))

@mock.patch('airflow.models.DagBag')
def test_trigger_dag_with_str_conf(self, dag_bag_mock):
dag_id = "trigger_dag_with_str_conf"
Expand Down