Skip to content

Kill kube watcher instance if it doesnt terminate gracefully in 60 seconds #52662

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

Merged
potiuk merged 4 commits into from
Jul 30, 2025
+11 −1
Merged

Kill kube watcher instance if it doesnt terminate gracefully in 60 seconds #52662

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4ba18b1
Kill kube watcher instance if it doesnt terminate gracefully in 60 se…
pavansharma36 Jul 1, 2025
419143b
Merge branch 'main' into main
pavansharma36 Jul 25, 2025
44e0222
suggested changes
pavansharma36 Jul 25, 2025
e97ddfe
Merge branch 'main' into main
potiuk Jul 30, 2025
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: 11 additions & 1 deletion ...f/kubernetes/src/airflow/providers/cncf/kubernetes/executors/kubernetes_executor_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -530,7 +530,17 @@ def terminate(self) -> None:
self.log.debug("Terminating kube_watchers...")
for kube_watcher in self.kube_watchers.values():
kube_watcher.terminate()
kube_watcher.join()
self.log.debug("kube_watcher=%s", kube_watcher)

# for now 20 seconds is max wait time for kube watchers to terminate.
max_wait_time = 20
start_time = time.time()
for kube_watcher in self.kube_watchers.values():
kube_watcher.join(timeout=max(int(max_wait_time - (time.time() - start_time)), 0))
if kube_watcher.is_alive():
self.log.warning("kube_watcher didn't terminate in time=%s", kube_watcher)
kube_watcher.kill()
kube_watcher.join()
self.log.debug("kube_watcher=%s", kube_watcher)
self.log.debug("Flushing watcher_queue...")
self._flush_watcher_queue()
Expand Down