Skip to content

Coerce explicit None _request_timeout in async/sync k8s API clients #69611

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

Open
ZhaoMJ wants to merge 2 commits into
base: main
Choose a base branch
from
+20 −2
Open

Coerce explicit None _request_timeout in async/sync k8s API clients #69611

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
fd52db4
fix: coerce explicit None _request_timeout in async/sync k8s API clients
Jul 8, 2026
d93567e
Merge branch 'main' into fix/kubernetes-async-client-request-timeout
ZhaoMJ Jul 8, 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
12 changes: 10 additions & 2 deletions providers/cncf/kubernetes/src/airflow/providers/cncf/kubernetes/hooks/kubernetes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,10 @@ def __init__(

def call_api(self, *args, **kwargs):
timeout_seconds = kwargs.get("timeout_seconds") # get server-side timeout
kwargs.setdefault("_request_timeout", _get_request_timeout(timeout_seconds)) # client-side timeout
# Use setdefault's intent but handle explicit None: generated kubernetes client methods always
# pass _request_timeout=None explicitly, making setdefault a no-op and leaving an infinite timeout.
if kwargs.get("_request_timeout") is None:
kwargs["_request_timeout"] = _get_request_timeout(timeout_seconds)
return super().call_api(*args, **kwargs)


Expand All @@ -119,7 +122,12 @@ def __init__(

async def call_api(self, *args, **kwargs):
timeout_seconds = kwargs.get("timeout_seconds") # server-side timeout
kwargs.setdefault("_request_timeout", _get_request_timeout(timeout_seconds)) # client-side timeout
# Use setdefault's intent but handle explicit None: generated kubernetes_asyncio client methods
# always pass _request_timeout=None explicitly, making setdefault a no-op and leaving an infinite
# timeout. On a half-open TCP connection (e.g. after a 429 or LB-side 500), this causes the
# trigger's await to hang indefinitely with no exception, preventing any retry or recovery.
if kwargs.get("_request_timeout") is None:
kwargs["_request_timeout"] = _get_request_timeout(timeout_seconds)
return await super().call_api(*args, **kwargs)


Expand Down
10 changes: 10 additions & 0 deletions providers/cncf/kubernetes/tests/unit/cncf/kubernetes/hooks/test_kubernetes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,12 @@ class TestTimeoutK8sApiClient:
("kwargs", "expected_timeout"),
[
pytest.param({}, API_TIMEOUT, id="default-timeout"),
# Generated kubernetes client methods always pass _request_timeout=None explicitly,
# so setdefault() is a no-op. The fix must coerce None to the default timeout.
pytest.param({"_request_timeout": None}, API_TIMEOUT, id="explicit-none-timeout"),
pytest.param({"timeout_seconds": 5678, "_request_timeout": 1234}, 1234, id="explicit-timeout"),
# Log-streaming path passes a (connection, read) tuple; it must not be clobbered.
pytest.param({"_request_timeout": (1800, 300)}, (1800, 300), id="explicit-tuple-preserved"),
pytest.param(
{"timeout_seconds": API_TIMEOUT - API_TIMEOUT_OFFSET_SERVER_SIDE},
API_TIMEOUT,
Expand Down Expand Up @@ -127,7 +132,12 @@ class TestTimeoutAsyncK8sApiClient:
("kwargs", "expected_timeout"),
[
pytest.param({}, API_TIMEOUT, id="default-timeout"),
# Generated kubernetes_asyncio client methods always pass _request_timeout=None explicitly,
# so setdefault() is a no-op. The fix must coerce None to the default timeout.
pytest.param({"_request_timeout": None}, API_TIMEOUT, id="explicit-none-timeout"),
pytest.param({"timeout_seconds": 5678, "_request_timeout": 1234}, 1234, id="explicit-timeout"),
# Log-streaming path passes a (connection, read) tuple; it must not be clobbered.
pytest.param({"_request_timeout": (1800, 300)}, (1800, 300), id="explicit-tuple-preserved"),
pytest.param(
{"timeout_seconds": API_TIMEOUT - API_TIMEOUT_OFFSET_SERVER_SIDE},
API_TIMEOUT,
Expand Down