Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
14 changes: 14 additions & 0 deletions airflow/utils/log/file_task_handler.py
Original file line number Diff line number Diff line change
Expand Up @@ -617,6 +617,20 @@ def _read_from_logs_server(self, ti, worker_log_rel_path) -> tuple[list[str], li
"See more at https://airflow.apache.org/docs/apache-airflow/"
"stable/configurations-ref.html#secret-key"
)
elif response.status_code == 404:
worker_log_full_path = Path(self.local_base, worker_log_rel_path)
fallback_messages, fallback_logs = self._read_from_local(worker_log_full_path)
if fallback_logs:
messages.extend(fallback_messages)
logs.extend(fallback_logs)
else:
messages.append(
f"Log file not found on worker '{ti.hostname}'. "
f"This attempt may have run on a different worker whose logs "
f"are no longer accessible. "
f"Consider configuring remote logging (S3, GCS, etc.) for log persistence."
)
return messages, logs
# Check if the resource was properly fetched
response.raise_for_status()
if response.text:
Expand Down
84 changes: 84 additions & 0 deletions tests/utils/log/test_file_task_handler.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
from __future__ import annotations

from pathlib import Path
from unittest.mock import MagicMock, patch

from airflow.utils.log.file_task_handler import FileTaskHandler


class TestFileTaskHandlerLogServer:
"""Tests for _read_from_logs_server 404 handling."""

def setup_method(self):
self.handler = FileTaskHandler(base_log_folder="/tmp/test_logs")
self.ti = MagicMock()
self.ti.hostname = "worker-1"
self.ti.triggerer_job = None
self.ti.task = None

@patch("airflow.utils.log.file_task_handler._fetch_logs_from_service")
@patch.object(FileTaskHandler, "_get_log_retrieval_url")
@patch.object(FileTaskHandler, "_read_from_local")
def test_404_falls_back_to_local_when_available(self, mock_read_local, mock_get_url, mock_fetch):
"""When log server returns 404 and local logs exist, use local logs."""
mock_get_url.return_value = ("http://worker-1/log", "dag/run/task/1.log")
mock_response = MagicMock()
mock_response.status_code = 404
mock_fetch.return_value = mock_response
mock_read_local.return_value = (["Found local files:"], ["log content"])

messages, logs = self.handler._read_from_logs_server(self.ti, "dag/run/task/1.log")

assert logs == ["log content"]
assert "Found local files:" in messages
mock_read_local.assert_called_once_with(Path("/tmp/test_logs", "dag/run/task/1.log"))

@patch("airflow.utils.log.file_task_handler._fetch_logs_from_service")
@patch.object(FileTaskHandler, "_get_log_retrieval_url")
@patch.object(FileTaskHandler, "_read_from_local")
def test_404_shows_clear_message_when_no_local_fallback(self, mock_read_local, mock_get_url, mock_fetch):
"""When log server returns 404 and no local logs exist, show helpful message."""
mock_get_url.return_value = ("http://worker-1/log", "dag/run/task/1.log")
mock_response = MagicMock()
mock_response.status_code = 404
mock_fetch.return_value = mock_response
mock_read_local.return_value = ([], [])

messages, logs = self.handler._read_from_logs_server(self.ti, "dag/run/task/1.log")

assert len(messages) == 1
assert "worker-1" in messages[0]
assert "no longer accessible" in messages[0]
assert "remote logging" in messages[0]
assert logs == []

@patch("airflow.utils.log.file_task_handler._fetch_logs_from_service")
@patch.object(FileTaskHandler, "_get_log_retrieval_url")
def test_403_shows_secret_key_message(self, mock_get_url, mock_fetch):
"""When log server returns 403, show secret key configuration message."""
mock_get_url.return_value = ("http://worker-1/log", "dag/run/task/1.log")
mock_response = MagicMock()
mock_response.status_code = 403
mock_fetch.return_value = mock_response
mock_response.raise_for_status.side_effect = Exception("403")

messages, logs = self.handler._read_from_logs_server(self.ti, "dag/run/task/1.log")

assert any("secret_key" in m for m in messages)
Comment thread
eladkal marked this conversation as resolved.
Outdated
Loading