Skip to content

fix(timetable): fix failing to manually trigger a Dag with CronPartitionedTimetable #62441

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
Lee-W merged 1 commit into from
Feb 25, 2026
Merged

fix(timetable): fix failing to manually trigger a Dag with CronPartitionedTimetable #62441

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
11 changes: 5 additions & 6 deletions airflow-core/src/airflow/timetables/trigger.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -516,12 +516,11 @@ def generate_run_id(
data_interval: DataInterval | None,
**extra,
) -> str:
components = [
run_after.isoformat(),
extra.get("partition_key"),
get_random_string(),
]
return run_type.generate_run_id(suffix="__".join(components))
suffix = run_after.isoformat()
if partition_key := extra.get("partition_key"):
suffix = f"{suffix}__{partition_key}"
suffix = f"{suffix}__{get_random_string()}"
return run_type.generate_run_id(suffix=suffix)

def next_run_info_from_dag_model(self, *, dag_model: DagModel) -> DagRunInfo:
run_after = timezone.coerce_datetime(dag_model.next_dagrun_create_after)
Expand Down
20 changes: 20 additions & 0 deletions airflow-core/tests/unit/timetables/test_trigger_timetable.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,12 @@
from airflow.sdk import CronPartitionTimetable
from airflow.timetables.base import DagRunInfo, DataInterval, TimeRestriction, Timetable
from airflow.timetables.trigger import (
CronPartitionTimetable as CoreCronPartitionTimetable,
CronTriggerTimetable,
DeltaTriggerTimetable,
MultipleCronTriggerTimetable,
)
from airflow.utils.types import DagRunType

START_DATE = pendulum.DateTime(2021, 9, 4, tzinfo=utc)

Expand Down Expand Up @@ -809,3 +811,21 @@ def test_next_run_info_from_dag_model(schedule, partition_key, expected, dag_mak
dm = dag_maker.dag_model
info = dag_maker.serialized_dag.timetable.next_run_info_from_dag_model(dag_model=dm)
assert info == expected


def test_generate_run_id_without_partition_key() -> None:
"""
Tests the generate_run_id method of CronPartitionTimetable.

generate_run_id shouldn't break even if when the run is manually trigger (partition_key might be missing).
"""
cron_partitioned_timetabe = CoreCronPartitionTimetable(
"0 * * * *",
timezone=pendulum.UTC,
)
run_id = cron_partitioned_timetabe.generate_run_id(
run_type=DagRunType.MANUAL,
run_after=pendulum.DateTime(2025, 6, 7, 8, 9, tzinfo=pendulum.UTC),
data_interval=None,
)
assert run_id.startswith("manual__2025-06-07T08:09:00+00:00__")