Skip to content
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.

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

Fix import order for task_instance_mutation_hook #15851

Merged
merged 1 commit into from
May 15, 2021

Conversation

junnplus
Copy link
Contributor

Fixed #15698

import from airflow.models.dagrun module may cause task_instance_mutation_hook to be overwritten.


^ Add meaningful description above

Read the Pull Request Guidelines for more information.
In case of fundamental code change, 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 UPDATING.md.

@ashb ashb added this to the Airflow 2.1 milestone May 14, 2021
airflow/models/dagrun.py Outdated Show resolved Hide resolved
airflow/models/dagrun.py Show resolved Hide resolved
@@ -41,7 +41,6 @@
from airflow.exceptions import AirflowException, TaskNotFound
from airflow.models.base import ID_LEN, Base
from airflow.models.taskinstance import TaskInstance as TI
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
from airflow.models.taskinstance import TaskInstance as TI
from airflow.models.taskinstance import TaskInstance as TI
from airflow.settings import task_instance_mutation_hook

Copy link
Member

@ashb ashb May 14, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The fix is to quite literally delay the import, to avoid an import cycle.

At the point this was imported, the local settings hadn't been applied, so this was always going to be a no-op.

@github-actions github-actions bot added the full tests needed We need to run full set of tests for this PR to merge label May 14, 2021
@github-actions
Copy link

The PR most likely needs to run full matrix of tests because it modifies parts of the core of Airflow. However, committers might decide to merge it quickly and take the risk. If they don't merge it quickly - please rebase it to the latest master at your convenience, or amend the last commit of the PR, and push it with --force-with-lease.

@kaxil
Copy link
Member

kaxil commented May 15, 2021

Can you rebase on latest master please?

@junnplus
Copy link
Contributor Author

junnplus commented May 15, 2021

Can you rebase on latest master please?

Done.

@ashb
Copy link
Member

ashb commented May 15, 2021

@jhtimmins I'm just about to merge this h we need to make sure we include it in 2.1

@ashb ashb merged commit 3919ee6 into apache:master May 15, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
full tests needed We need to run full set of tests for this PR to merge
Projects
None yet
Development

Successfully merging this pull request may close these issues.

task_instance_mutation_hook not called by scheduler when importing airflow.models.taskinstance
4 participants