Skip to content

Save scheduler execution time during search for queued dag_runs #30699

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
pierrejeambrun merged 5 commits into from
May 25, 2023
Merged

Save scheduler execution time during search for queued dag_runs #30699

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7031a20
Function returns list of dagruns and not query
Apr 18, 2023
ea7eb4c
Changed pytests
Apr 19, 2023
1489c4e
Changed all to _start_queued_dagruns
May 23, 2023
93e8bd9
Added comment and fixed tests
May 23, 2023
e5694f0
Fixed typo
May 25, 2023
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
3 changes: 2 additions & 1 deletion airflow/jobs/scheduler_job_runner.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1298,7 +1298,8 @@ def _should_update_dag_next_dagruns(self, dag: DAG, dag_model: DagModel, total_a

def _start_queued_dagruns(self, session: Session) -> None:
"""Find DagRuns in queued state and decide moving them to running state."""
dag_runs: Collection[DagRun] = self._get_next_dagruns_to_examine(DagRunState.QUEUED, session)
# added all() to save runtime, otherwise query is executed more than once
dag_runs: Collection[DagRun] = self._get_next_dagruns_to_examine(DagRunState.QUEUED, session).all()

active_runs_of_dags = Counter(
DagRun.active_runs_of_dags((dr.dag_id for dr in dag_runs), only_running=True, session=session),
Expand Down
4 changes: 3 additions & 1 deletion tests/jobs/test_scheduler_job.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5141,7 +5141,9 @@ def test_execute_queries_count_with_harvested_dags(self, expected_query_count, d

with assert_queries_count(expected_query_count, margin=15):
with mock.patch.object(DagRun, "next_dagruns_to_examine") as mock_dagruns:
mock_dagruns.return_value = dagruns
query = MagicMock()
query.all.return_value = dagruns
mock_dagruns.return_value = query

self.job_runner._run_scheduler_loop()

Expand Down