More typing in SchedulerJob and TaskInstance #24912
Merged
Conversation
This file contains 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
boring-cyborg
bot
added
the
area:Scheduler
jedcunningham
commented
Jul 8, 2022
Comment on lines
+452
to
+453
| TI.dag_id == dag_id, TI.state == TaskInstanceState.SCHEDULED | ||
| ).update({TI.state: TaskInstanceState.FAILED}, synchronize_session='fetch') |
There was a problem hiding this comment.
Technically just a typing change, but we were using the wrong one.
| @@ -790,7 +794,7 @@ def _update_dag_run_state_for_paused_dags(self): | |||
| dag = SerializedDagModel.get_dag(dag_id) | |||
| if dag is None: | |||
| continue | |||
| dag_runs = DagRun.find(dag_id=dag_id, state=State.RUNNING) | |||
| dag_runs = DagRun.find(dag_id=dag_id, state=DagRunState.RUNNING) | |||
There was a problem hiding this comment.
Also here, using the wrong one.
uranusjr
reviewed
Jul 8, 2022
Co-authored-by: Tzu-ping Chung <uranusjr@gmail.com>
jedcunningham
commented
Jul 8, 2022
airflow/models/taskinstance.py
Outdated
| @@ -197,7 +199,7 @@ def clear_task_instances( | |||
| if dag and dag.has_task(task_id): | |||
| task = dag.get_task(task_id) | |||
| ti.refresh_from_task(task) | |||
| task_retries = task.retries | |||
| task_retries = task.retries or 0 | |||
There was a problem hiding this comment.
I also had to add this, as task.retries is Optional[int]. Not sure it would have worked if it was None, but I'll look closer tomorrow.
There was a problem hiding this comment.
It wouldn’t work, and honestly I don’t even know what None means here. I think this is exposing a more fundamental bug…
ephraimbuddy
reviewed
Jul 8, 2022
|
I just pushed a commit to remove unnecessary |
potiuk
approved these changes
Jul 12, 2022
|
Conflicts need to be resolved. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
I noticed these were missing some typing. This doesn't bring us to complete coverage in TaskInstance, but gets all the easy ones out of the way.