This is an automated email from the ASF dual-hosted git repository.
pierrejeambrun pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/airflow.git
The following commit(s) were added to refs/heads/main by this push:
new 8eaf56069d1 Fix Dashboard for queued DagRuns (#49961)
8eaf56069d1 is described below
commit 8eaf56069d1a2ba18f765749fdebc1e4776a9b5d
Author: Pierre Jeambrun <[email protected]>
AuthorDate: Wed Apr 30 19:23:16 2025 +0200
Fix Dashboard for queued DagRuns (#49961)
---
.../api_fastapi/core_api/routes/ui/dashboard.py | 6 +++---
.../core_api/routes/ui/test_dashboard.py | 24 ++++++++++++++--------
2 files changed, 19 insertions(+), 11 deletions(-)
diff --git
a/airflow-core/src/airflow/api_fastapi/core_api/routes/ui/dashboard.py
b/airflow-core/src/airflow/api_fastapi/core_api/routes/ui/dashboard.py
index 1e8ff2e4f03..f3c01983641 100644
--- a/airflow-core/src/airflow/api_fastapi/core_api/routes/ui/dashboard.py
+++ b/airflow-core/src/airflow/api_fastapi/core_api/routes/ui/dashboard.py
@@ -58,7 +58,7 @@ def historical_metrics(
dag_run_types = session.execute(
select(DagRun.run_type, func.count(DagRun.run_id))
.where(
- DagRun.start_date >= start_date,
+ func.coalesce(DagRun.start_date, current_time) >= start_date,
func.coalesce(DagRun.end_date, current_time) <=
func.coalesce(end_date, current_time),
)
.group_by(DagRun.run_type)
@@ -67,7 +67,7 @@ def historical_metrics(
dag_run_states = session.execute(
select(DagRun.state, func.count(DagRun.run_id))
.where(
- DagRun.start_date >= start_date,
+ func.coalesce(DagRun.start_date, current_time) >= start_date,
func.coalesce(DagRun.end_date, current_time) <=
func.coalesce(end_date, current_time),
)
.group_by(DagRun.state)
@@ -78,7 +78,7 @@ def historical_metrics(
select(TaskInstance.state, func.count(TaskInstance.run_id))
.join(TaskInstance.dag_run)
.where(
- DagRun.start_date >= start_date,
+ func.coalesce(DagRun.start_date, current_time) >= start_date,
func.coalesce(DagRun.end_date, current_time) <=
func.coalesce(end_date, current_time),
)
.group_by(TaskInstance.state)
diff --git
a/airflow-core/tests/unit/api_fastapi/core_api/routes/ui/test_dashboard.py
b/airflow-core/tests/unit/api_fastapi/core_api/routes/ui/test_dashboard.py
index aab0dca59a7..031dfcc7171 100644
--- a/airflow-core/tests/unit/api_fastapi/core_api/routes/ui/test_dashboard.py
+++ b/airflow-core/tests/unit/api_fastapi/core_api/routes/ui/test_dashboard.py
@@ -84,11 +84,19 @@ def make_dag_runs(dag_maker, session, time_machine):
run_id="run_3",
state=DagRunState.RUNNING,
run_type=DagRunType.SCHEDULED,
- logical_date=pendulum.DateTime(2023, 2, 3, 0, 0, 0,
tzinfo=pendulum.UTC),
- start_date=pendulum.DateTime(2023, 2, 3, 0, 0, 0, tzinfo=pendulum.UTC),
+ logical_date=date + timedelta(days=2),
+ start_date=date + timedelta(days=2),
)
+
run3.end_date = None
+ dag_maker.create_dagrun(
+ run_id="run_4",
+ state=DagRunState.QUEUED,
+ run_type=DagRunType.SCHEDULED,
+ logical_date=date + timedelta(days=3),
+ )
+
for ti in run1.task_instances:
ti.state = TaskInstanceState.SUCCESS
@@ -208,12 +216,12 @@ class TestHistoricalMetricsDataEndpoint:
(
{"start_date": "2023-01-01T00:00", "end_date":
"2023-08-02T00:00"},
{
- "dag_run_states": {"failed": 1, "queued": 0, "running": 1,
"success": 1},
- "dag_run_types": {"backfill": 0, "asset_triggered": 1,
"manual": 0, "scheduled": 2},
+ "dag_run_states": {"failed": 1, "queued": 1, "running": 1,
"success": 1},
+ "dag_run_types": {"backfill": 0, "asset_triggered": 1,
"manual": 0, "scheduled": 3},
"task_instance_states": {
"deferred": 0,
"failed": 2,
- "no_status": 2,
+ "no_status": 4,
"queued": 0,
"removed": 0,
"restarting": 0,
@@ -252,12 +260,12 @@ class TestHistoricalMetricsDataEndpoint:
(
{"start_date": "2023-02-02T00:00"},
{
- "dag_run_states": {"failed": 1, "queued": 0, "running": 1,
"success": 0},
- "dag_run_types": {"backfill": 0, "asset_triggered": 1,
"manual": 0, "scheduled": 1},
+ "dag_run_states": {"failed": 1, "queued": 1, "running": 1,
"success": 0},
+ "dag_run_types": {"backfill": 0, "asset_triggered": 1,
"manual": 0, "scheduled": 2},
"task_instance_states": {
"deferred": 0,
"failed": 2,
- "no_status": 2,
+ "no_status": 4,
"queued": 0,
"removed": 0,
"restarting": 0,
