Skip to content

Elasticsearch Provider: Fix logs downloading for tasks #14686

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
kaxil merged 1 commit into from
Mar 9, 2021
Merged

Elasticsearch Provider: Fix logs downloading for tasks #14686

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 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 @@ -183,11 +183,11 @@ def _read(
if (
cur_ts.diff(last_log_ts).in_minutes() >= 5
or 'max_offset' in metadata
and offset >= metadata['max_offset']
and int(offset) >= int(metadata['max_offset'])
):
metadata['end_of_log'] = True

if offset != next_offset or 'last_log_timestamp' not in metadata:
if int(offset) != int(next_offset) or 'last_log_timestamp' not in metadata:
metadata['last_log_timestamp'] = str(cur_ts)

# If we hit the end of the log, remove the actual end_of_log message
Expand Down
2 changes: 1 addition & 1 deletion tests/providers/elasticsearch/log/test_es_task_handler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ def test_read_with_match_phrase_query(self):

ts = pendulum.now()
logs, metadatas = self.es_task_handler.read(
self.ti, 1, {'offset': 0, 'last_log_timestamp': str(ts), 'end_of_log': False}
self.ti, 1, {'offset': '0', 'last_log_timestamp': str(ts), 'end_of_log': False, 'max_offset': 2}
)
assert 1 == len(logs)
assert len(logs) == len(metadatas)
Expand Down