wolfdn opened a new pull request, #64962:
URL: https://github.com/apache/airflow/pull/64962
<!-- SPDX-License-Identifier: Apache-2.0
https://www.apache.org/licenses/LICENSE-2.0 -->
<!--
Thank you for contributing!
Please provide above a brief description of the changes made in this pull
request.
Write a good git commit message following this guide:
http://chris.beams.io/posts/git-commit/
Please make sure that your code changes are covered with tests.
And in case of new features or big changes remember to adjust the
documentation.
Feel free to ping (in general) for the review if you do not see reaction for
a few days
(72 Hours is the minimum reaction time you can expect from volunteers) - we
sometimes miss notifications.
In case of an existing issue, reference it using one of the following:
* closes: #ISSUE
* related: #ISSUE
-->
## Problem
When using `do_xcom_push=True` with the `KubernetesPodOperator`, an xcom
sidecar container is injected into the pod to facilitate XCom value transfer.
If communication with the Kubernetes API fails during cleanup (e.g. the kill
command for the sidecar cannot be sent), the xcom sidecar container may remain
running even after the base container has completed.
In this scenario, `await_pod_completion` waits indefinitely for the pod to
reach a terminal phase — which never happens because the still-running xcom
sidecar keeps the pod in the `Running` phase.
Additionally, the `cleanup` method determines task success/failure based on
the overall pod phase rather than the base container's status. When the xcom
sidecar prevents the pod from reaching `Succeeded`, a task whose base container
completed successfully is incorrectly marked as failed.
## Solution
This change extends the existing istio sidecar handling to also cover the
xcom sidecar container:
1. **`await_pod_completion`** (`pod_manager.py`): When `do_xcom_push=True`,
break out of the pod-completion wait loop as soon as the base container has
completed — just like the existing behavior for istio sidecars. A log message
is emitted to make this early exit visible.
2. **`cleanup`** (`pod.py`): When `do_xcom_push=True`, determine task
success/failure based on the base container's exit status rather than the
overall pod phase. This prevents a lingering xcom sidecar from causing a false
failure.
## Changes
-
`providers/cncf/kubernetes/src/airflow/providers/cncf/kubernetes/utils/pod_manager.py`
- Added `do_xcom_push` parameter to `await_pod_completion`
- Extended the sidecar-aware early exit condition from `istio_enabled` to
`istio_enabled or do_xcom_push`
- Added informational log message when breaking out early due to a sidecar
-
`providers/cncf/kubernetes/src/airflow/providers/cncf/kubernetes/operators/pod.py`
- Pass `self.do_xcom_push` to `await_pod_completion` in `_clean`
- Refactored `failed` determination in `cleanup` to check base container
status when `do_xcom_push` is enabled
---
##### Was generative AI tooling used to co-author this PR?
<!--
If generative AI tooling has been used in the process of authoring this PR,
please
change below checkbox to `[X]` followed by the name of the tool, uncomment
the "Generated-by".
-->
- [x] Yes (please specify the tool below)
GitHub Copilot - Claude Opus 4.6
<!--
Generated-by: [Tool Name] following [the
guidelines](https://github.com/apache/airflow/blob/main/contributing-docs/05_pull_requests.rst#gen-ai-assisted-contributions)
-->
---
* Read the **[Pull Request
Guidelines](https://github.com/apache/airflow/blob/main/contributing-docs/05_pull_requests.rst#pull-request-guidelines)**
for more information. Note: commit author/co-author name and email in commits
become permanently public when merged.
* For fundamental code changes, an Airflow Improvement Proposal
([AIP](https://cwiki.apache.org/confluence/display/AIRFLOW/Airflow+Improvement+Proposals))
is needed.
* When adding dependency, check compliance with the [ASF 3rd Party License
Policy](https://www.apache.org/legal/resolved.html#category-x).
* For significant user-facing changes create newsfragment:
`{pr_number}.significant.rst`, in
[airflow-core/newsfragments](https://github.com/apache/airflow/tree/main/airflow-core/newsfragments).
You can add this file in a follow-up commit after the PR is created so you
know the PR number.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
