Skip to content

Preserve AirflowTaskTimeout when timeout logging fails #69713

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

Closed
Andrushika wants to merge 2 commits into from
Closed

Preserve AirflowTaskTimeout when timeout logging fails #69713

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
e143679
Don't let a failed log write swallow AirflowTaskTimeout in handle_tim…
Andrushika Jul 10, 2026
ce88bf8
Delete lengthy comment
Andrushika Jul 27, 2026
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
5 changes: 4 additions & 1 deletion task-sdk/src/airflow/sdk/execution_time/timeout.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
# under the License.
from __future__ import annotations

import contextlib
import os

import structlog
Expand All @@ -35,7 +36,9 @@ def __init__(self, seconds=1, error_message="Timeout"):

def handle_timeout(self, signum, frame):
"""Log information and raises AirflowTaskTimeout."""
self.log.error("Process timed out", pid=os.getpid())
# Ensure the timeout isn't masked by a logging error
with contextlib.suppress(OSError):
self.log.error("Process timed out", pid=os.getpid())
raise AirflowTaskTimeout(self.error_message)

def __enter__(self):
Expand Down
26 changes: 26 additions & 0 deletions task-sdk/tests/task_sdk/execution_time/test_timeout.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,3 +75,29 @@ def test_timeout_happens(self):
tp = TimeoutPosix(seconds=1, error_message="boom")
with pytest.raises(AirflowTaskTimeout, match="boom"):
tp.handle_timeout(signal.SIGALRM, None)

def test_handle_timeout_raises_even_when_log_write_fails(self):
if not hasattr(signal, "SIGALRM"):
pytest.skip("SIGALRM not supported on this platform")

tp = TimeoutPosix(seconds=1, error_message="boom")
tp.log = mock.MagicMock()
tp.log.error.side_effect = BrokenPipeError("supervisor pipe closed")

with pytest.raises(AirflowTaskTimeout, match="boom"):
tp.handle_timeout(signal.SIGALRM, None)

tp.log.error.assert_called_once_with("Process timed out", pid=mock.ANY)

def test_handle_timeout_normal_path_logs_and_raises(self):
"""Regression guard: on the happy path the log is emitted AND AirflowTaskTimeout is raised."""
if not hasattr(signal, "SIGALRM"):
pytest.skip("SIGALRM not supported on this platform")

tp = TimeoutPosix(seconds=1, error_message="boom")
tp.log = mock.MagicMock()

with pytest.raises(AirflowTaskTimeout, match="boom"):
tp.handle_timeout(signal.SIGALRM, None)

tp.log.error.assert_called_once_with("Process timed out", pid=mock.ANY)