Fix custom timetable generate_run_id not called for manual triggers #56373
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
NilsJPWerner
requested review from
ephraimbuddy,
jason810496,
pierrejeambrun and
rawwar
as code owners
|
Congratulations on your first Pull Request and welcome to the Apache Airflow community! If you have any issues or are unsure about any anything please check our Contributors' Guide (https://github.com/apache/airflow/blob/main/contributing-docs/README.rst)
|
NilsJPWerner
force-pushed
the
issue-46616
branch
from
7d7c5b2 to
dbefee1
Compare
Contributor
Author
Contributor
Author
|
A little bump on this. Would love to get this in for 3.1.1 @kaxil |
pierrejeambrun
added
the
backport-to-v3-1-test
pierrejeambrun
approved these changes
Oct 13, 2025
Member
pierrejeambrun
left a comment
pierrejeambrun
left a comment
There was a problem hiding this comment.
LGTM but I'll wait for another pair of eyes.
Member
|
CI need fixing. |
Contributor
Author
They seem unrelated to my changes. I rebased but it didn't seem to retrigger ci |
ephraimbuddy
approved these changes
Oct 14, 2025
In Airflow 3.x, commit 035060d (PR apache#46616) changed the trigger_dag module to use DagRun.generate_run_id() instead of dag.timetable.generate_run_id() for manual DAG runs. This bypassed custom timetable logic, causing a regression from Airflow 2.x behavior. This commit restores the use of dag.timetable.generate_run_id() for manual triggers, allowing custom timetables to control run_id generation for both scheduled and manually triggered runs. Changes: - airflow/api/common/trigger_dag.py: Changed to call dag.timetable.generate_run_id() with run_after and data_interval parameters instead of DagRun.generate_run_id() - tests/api_fastapi/core_api/routes/public/test_dag_run.py: Added test to verify custom timetable generate_run_id is called for manual triggers with both logical_date provided and null This pattern matches how manual triggers are handled in other parts of the codebase (e.g., assets.py, scheduler_job_runner.py). Fixes: apache#55908
pierrejeambrun
force-pushed
the
issue-46616
branch
from
13f3c50 to
5d7eef9
Compare
Member
|
I just rebased the PR, lets see if the CI is happy now. |
Member
|
static check need fixing, this is related to your code change. |
Contributor
Author
Sorry I misread the position of the ruff check. I have fixed it now. |
Member
|
Need to fix test, otherwise this makes sense to me. |
NilsJPWerner
requested review from
bugraoz93 and
shubhamraj-git
as code owners
Contributor
Author
|
When fixing the tests I realized I also needed to fix this in the fastapi endpoint. |
|
Awesome work, congrats on your first merged pull request! You are invited to check our Issue Tracker for additional contributions. |
github-actions bot
pushed a commit
that referenced
this pull request
Oct 16, 2025
…l triggers (#56373) (cherry picked from commit c28b211) Co-authored-by: Nils Werner <[email protected]>
Backport successfully created: v3-1-test
|
github-actions bot
pushed a commit
to aws-mwaa/upstream-to-airflow
that referenced
this pull request
Oct 16, 2025
…l triggers (apache#56373) (cherry picked from commit c28b211) Co-authored-by: Nils Werner <[email protected]>
potiuk
pushed a commit
that referenced
this pull request
Oct 16, 2025
…l triggers (#56373) (#56699) (cherry picked from commit c28b211) Co-authored-by: Nils Werner <[email protected]>
snreddygopu
pushed a commit
to Teradata/airflow
that referenced
this pull request
Oct 16, 2025
abdulrahman305 bot
pushed a commit
to abdulrahman305/airflow
that referenced
this pull request
Oct 17, 2025
abdulrahman305 bot
pushed a commit
to abdulrahman305/airflow
that referenced
this pull request
Oct 19, 2025
TyrellHaywood
pushed a commit
to TyrellHaywood/airflow
that referenced
this pull request
Oct 22, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
In Airflow 3.x, commit 035060d (PR #46616) changed the trigger_dag module to use DagRun.generate_run_id() instead of
dag.timetable.generate_run_id() for manual DAG runs. This bypassed custom timetable logic, causing a regression from Airflow 2.x behavior.
This commit restores the use of dag.timetable.generate_run_id() for manual triggers, allowing custom timetables to control run_id generation for both scheduled and manually triggered runs.
Changes:
This pattern matches how manual triggers are handled in other parts of the codebase (e.g., assets.py, scheduler_job_runner.py).
Fixes: #55908
^ Add meaningful description above
Read the Pull Request Guidelines for more information.
In case of fundamental code changes, an Airflow Improvement Proposal (AIP) is needed.
In case of a new dependency, check compliance with the ASF 3rd Party License Policy.
In case of backwards incompatible changes please leave a note in a newsfragment file, named
{pr_number}.significant.rstor{issue_number}.significant.rst, in airflow-core/newsfragments.