Skip to content
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

Jump to bottom

Don't re-patch pods that are already controlled by current worker #26778

Merged
merged 1 commit into from
Oct 18, 2022
Merged

Don't re-patch pods that are already controlled by current worker #26778

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 3 additions & 2 deletions airflow/executors/kubernetes_executor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -759,14 +759,15 @@ def _adopt_completed_pods(self, kube_client: client.CoreV1Api) -> None:
"""
if not self.scheduler_job_id:
raise AirflowException(NOT_STARTED_MESSAGE)
new_worker_id_label = pod_generator.make_safe_label_value(self.scheduler_job_id)
kwargs = {
'field_selector': "status.phase=Succeeded",
'label_selector': 'kubernetes_executor=True',
'label_selector': f'kubernetes_executor=True,airflow-worker!={new_worker_id_label}',
}
pod_list = kube_client.list_namespaced_pod(namespace=self.kube_config.kube_namespace, **kwargs)
for pod in pod_list.items:
self.log.info("Attempting to adopt pod %s", pod.metadata.name)
pod.metadata.labels['airflow-worker'] = pod_generator.make_safe_label_value(self.scheduler_job_id)
pod.metadata.labels['airflow-worker'] = new_worker_id_label
try:
kube_client.patch_namespaced_pod(
name=pod.metadata.name,
Expand Down