Skip to content

do not fail operator if we cannot find logs #34570

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
o-nikolas merged 2 commits into from
Sep 26, 2023
Merged

do not fail operator if we cannot find logs #34570

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ad0361e
do not fail operator if we cannot find logs
vandonr-amz Sep 22, 2023
e07cc34
capitalization in log message
vandonr-amz Sep 22, 2023
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: 6 additions & 1 deletion airflow/providers/amazon/aws/operators/batch.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,7 +359,12 @@ def monitor_job(self, context: Context):
else:
self.hook.wait_for_job(self.job_id)

awslogs = self.hook.get_job_all_awslogs_info(self.job_id)
awslogs = []
try:
awslogs = self.hook.get_job_all_awslogs_info(self.job_id)
except AirflowException as ae:
self.log.warning("Cannot determine where to find the AWS logs for this Batch job: %s", ae)

@Lee-W Lee-W Sep 23, 2023

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Should we add a test case to it?

@vandonr-amz vandonr-amz Sep 25, 2023

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

honestly, I think a test for this would be overkill.
It's a 6 lines change, and there is really very little room for a mistake in it, there is no logic, it's just a try/except.
Adding a test would make this commit 10x bigger, with no added benefit imho.

It's not like someone would come across this code and remove the try/except block thinking it's useless, only to be caught by the test. It's already documented in place by the text of the warning log.

@Lee-W Lee-W Sep 26, 2023

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

sounds good 👍


if awslogs:
self.log.info("AWS Batch job (%s) CloudWatch Events details found. Links to logs:", self.job_id)
link_builder = CloudWatchEventsLink()
Expand Down