This is an automated email from the ASF dual-hosted git repository.

shahar1 pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/airflow.git


The following commit(s) were added to refs/heads/main by this push:
     new 4464c2d8235 Remove useless check on K8S pod xcom read output (#77296)
4464c2d8235 is described below

commit 4464c2d8235f140c9f424819472f03e19a96f06b
Author: raphaelauv <[email protected]>
AuthorDate: Thu Nov 19 20:28:52 2026 +0100

    Remove useless check on K8S pod xcom read output (#77296)
---
 .../providers/cncf/kubernetes/utils/pod_manager.py      |  7 +------
 .../unit/cncf/kubernetes/utils/test_pod_manager.py      | 17 -----------------
 2 files changed, 1 insertion(+), 23 deletions(-)

diff --git 
a/providers/cncf/kubernetes/src/airflow/providers/cncf/kubernetes/utils/pod_manager.py
 
b/providers/cncf/kubernetes/src/airflow/providers/cncf/kubernetes/utils/pod_manager.py
index 62c333648db..4d210019e0c 100644
--- 
a/providers/cncf/kubernetes/src/airflow/providers/cncf/kubernetes/utils/pod_manager.py
+++ 
b/providers/cncf/kubernetes/src/airflow/providers/cncf/kubernetes/utils/pod_manager.py
@@ -1032,7 +1032,6 @@ class PodManager(LoggingMixin):
             f"then cat {PodDefaults.XCOM_MOUNT_PATH}/return.json; "
             f"else echo {EMPTY_XCOM_RESULT}; fi"
         )
-        result = None
         with closing(
             kubernetes_stream(
                 self._client.connect_get_namespaced_pod_exec,
@@ -1057,16 +1056,12 @@ class PodManager(LoggingMixin):
             if client.peek_stderr():
                 stderr = client.read_stderr().decode("utf-8", errors="replace")
                 self.log.error("stderr from command: %s", stderr)
-            raw_result = client.read_all()
-            if raw_result is not None:
-                result = raw_result.decode("utf-8", errors="replace")
+            result = client.read_all().decode("utf-8", errors="replace")
             if result and result.rstrip() != EMPTY_XCOM_RESULT:
                 # Note: result string is parsed to check if its valid json.
                 # This function still returns a string which is converted into 
json in the calling method.
                 json.loads(result)
 
-        if result is None:
-            raise XComRetrievalError(f"Failed to extract xcom from pod: 
{pod.metadata.name}")
         return result
 
     @generic_api_retry
diff --git 
a/providers/cncf/kubernetes/tests/unit/cncf/kubernetes/utils/test_pod_manager.py
 
b/providers/cncf/kubernetes/tests/unit/cncf/kubernetes/utils/test_pod_manager.py
index e0f14b53e45..ae6a0805a34 100644
--- 
a/providers/cncf/kubernetes/tests/unit/cncf/kubernetes/utils/test_pod_manager.py
+++ 
b/providers/cncf/kubernetes/tests/unit/cncf/kubernetes/utils/test_pod_manager.py
@@ -1462,23 +1462,6 @@ class TestPodManager:
         assert ret == xcom_result
         assert mock_exec_xcom_kill.call_count == 1
 
-    
@mock.patch("airflow.providers.cncf.kubernetes.utils.pod_manager.kubernetes_stream")
-    
@mock.patch("airflow.providers.cncf.kubernetes.utils.pod_manager.PodManager.extract_xcom_kill")
-    @mock.patch(
-        
"airflow.providers.cncf.kubernetes.utils.pod_manager.PodManager.container_is_running",
-        return_value=True,
-    )
-    def test_extract_xcom_none(self, mock_container_is_running, 
mock_exec_xcom_kill, mock_kubernetes_stream):
-        """test when None is retrieved from xcom sidecar container."""
-        mock_pod = MagicMock()
-        mock_client = MagicMock()
-        mock_client.peek_stderr.return_value = ""
-        mock_client.read_all.return_value = None
-        mock_kubernetes_stream.return_value = mock_client
-        with pytest.raises(XComRetrievalError, match=r"Failed to extract xcom 
from pod:"):
-            self.pod_manager.extract_xcom(pod=mock_pod)
-        assert mock_exec_xcom_kill.call_count == 1
-
     @mock.patch(
         
"airflow.providers.cncf.kubernetes.utils.pod_manager.PodManager.container_is_running",
         return_value=False,

Reply via email to