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.

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

Move fallible ti.task.dag assignment back inside try/except block (#24533) #24592

Merged
merged 2 commits into from
Jun 30, 2022
Merged

Move fallible ti.task.dag assignment back inside try/except block (#24533) #24592

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8d68822
Move fallible ti.task.dag assignment back inside try/except block
Jun 22, 2022
6eb5286
Remove unneeded variable annotation
uranusjr Jun 23, 2022
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
7 changes: 4 additions & 3 deletions airflow/providers/elasticsearch/log/es_task_handler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,12 +125,13 @@ def _render_log_id(self, ti: TaskInstance, try_number: int) -> str:
else:
log_id_template = self.log_id_template

dag = ti.task.dag
assert dag is not None # For Mypy.
try:
data_interval: Tuple[datetime, datetime] = dag.get_run_data_interval(dag_run)
dag = ti.task.dag
except AttributeError: # ti.task is not always set.
data_interval = (dag_run.data_interval_start, dag_run.data_interval_end)
else:
assert dag is not None # For Mypy.
data_interval = dag.get_run_data_interval(dag_run)

if self.json_format:
data_interval_start = self._clean_date(data_interval[0])
Expand Down
10 changes: 5 additions & 5 deletions airflow/utils/log/file_task_handler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,8 @@
import logging
import os
import warnings
from datetime import datetime
from pathlib import Path
from typing import TYPE_CHECKING, Optional, Tuple
from typing import TYPE_CHECKING, Optional

from airflow.configuration import AirflowConfigException, conf
from airflow.utils.context import Context
Expand Down Expand Up @@ -93,12 +92,13 @@ def _render_filename(self, ti: "TaskInstance", try_number: int) -> str:
context["try_number"] = try_number
return render_template_to_string(jinja_tpl, context)
elif str_tpl:
dag = ti.task.dag
assert dag is not None # For Mypy.
try:
data_interval: Tuple[datetime, datetime] = dag.get_run_data_interval(dag_run)
dag = ti.task.dag
except AttributeError: # ti.task is not always set.
data_interval = (dag_run.data_interval_start, dag_run.data_interval_end)
else:
assert dag is not None # For Mypy.
data_interval = dag.get_run_data_interval(dag_run)
if data_interval[0]:
data_interval_start = data_interval[0].isoformat()
else:
Expand Down