Skip to content

Extract common date log logic in _run_raw_task #9512

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
turbaszek merged 2 commits into from
Jun 26, 2020
+15 −19
Merged

Extract common date log logic in _run_raw_task #9512

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b26caea
Extract common log logic in _run_raw_task
turbaszek Jun 25, 2020
1dd8072
Update airflow/models/taskinstance.py
turbaszek Jun 25, 2020
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
34 changes: 15 additions & 19 deletions airflow/models/taskinstance.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -930,6 +930,13 @@ def check_and_change_state_before_execution(
self.log.info("Executing %s on %s", self.task, self.execution_date)
return True

def _date_or_empty(self, attr):
if hasattr(self, attr):
date = getattr(self, attr)
if date:
return date.strftime('%Y%m%dT%H%M%S')
return ''

@provide_session
@Sentry.enrich_errors
def _run_raw_task(
Expand Down Expand Up @@ -1014,7 +1021,6 @@ def signal_handler(signum, frame):

# If a timeout is specified for the task, make it fail
# if it goes beyond
result = None
Copy link
Copy Markdown
Member Author

@turbaszek turbaszek Jun 25, 2020

Choose a reason for hiding this comment

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

This was an unused argument, so I decided to remove it

if task_copy.execution_timeout:
try:
with timeout(int(
Expand Down Expand Up @@ -1057,15 +1063,10 @@ def signal_handler(signum, frame):
'dag_id=%s, task_id=%s, execution_date=%s, start_date=%s, end_date=%s',
self.dag_id,
self.task_id,
self.execution_date.strftime('%Y%m%dT%H%M%S') if hasattr(
self,
'execution_date') and self.execution_date else '',
self.start_date.strftime('%Y%m%dT%H%M%S') if hasattr(
self,
'start_date') and self.start_date else '',
self.end_date.strftime('%Y%m%dT%H%M%S') if hasattr(
self,
'end_date') and self.end_date else '')
self._date_or_empty('execution_date'),
self._date_or_empty('start_date'),
self._date_or_empty('end_date'),
)
except AirflowRescheduleException as reschedule_exception:
self.refresh_from_db()
self._handle_reschedule(actual_start_date, reschedule_exception, test_mode, context)
Expand Down Expand Up @@ -1104,15 +1105,10 @@ def signal_handler(signum, frame):
'dag_id=%s, task_id=%s, execution_date=%s, start_date=%s, end_date=%s',
self.dag_id,
self.task_id,
self.execution_date.strftime('%Y%m%dT%H%M%S') if hasattr(
self,
'execution_date') and self.execution_date else '',
self.start_date.strftime('%Y%m%dT%H%M%S') if hasattr(
self,
'start_date') and self.start_date else '',
self.end_date.strftime('%Y%m%dT%H%M%S') if hasattr(
self,
'end_date') and self.end_date else '')
self._date_or_empty('execution_date'),
self._date_or_empty('start_date'),
self._date_or_empty('end_date')
)
self.set_duration()
if not test_mode:
session.add(Log(self.state, self))
Expand Down