Skip to content

Fix DockerOperator on_kill to respect auto_remove='force' and remove …#67225

Open
jangByeongHui wants to merge 2 commits into
apache:mainfrom
jangByeongHui:fix/docker-on-kill-auto-remove
Open

Fix DockerOperator on_kill to respect auto_remove='force' and remove …#67225
jangByeongHui wants to merge 2 commits into
apache:mainfrom
jangByeongHui:fix/docker-on-kill-auto-remove

Conversation

@jangByeongHui
Copy link
Copy Markdown

Fix DockerOperator.on_kill() to respect auto_remove='force' and remove orphaned containers

When auto_remove='force' is set and a task is killed (e.g. timeout, manual
stop), on_kill() called cli.stop() but never called cli.remove_container().
This left the container running as an orphan even though the user explicitly
requested force-removal.

This PR adds a remove_container(force=True) call inside on_kill() when
auto_remove == "force", matching the behaviour that already exists in the
normal execution path. APIError is caught and logged (not re-raised) because
on_kill is best-effort — the container may already be gone by the time the
call is made.

closes: #56149


Was generative AI tooling used to co-author this PR?
  • Yes — Claude (claude-sonnet-4-6)

Generated-by: Claude (claude-sonnet-4-6) following the guidelines


  • Read the 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) is needed.
  • When adding dependency, check compliance with the ASF 3rd Party License Policy.
  • For significant user-facing changes create newsfragment: {pr_number}.significant.rst, in airflow-core/newsfragments. You can add this file in a follow-up commit after the PR is created so you know the PR number.

@boring-cyborg
Copy link
Copy Markdown

boring-cyborg Bot commented May 20, 2026

Congratulations on your first Pull Request and welcome to the Apache Airflow community! If you have any issues or are unsure about any anything please check our Contributors' Guide
Here are some useful points:

  • Pay attention to the quality of your code (ruff, mypy and type annotations). Our prek-hooks will help you with that.
  • In case of a new feature add useful documentation (in docstrings or in docs/ directory). Adding a new operator? Check this short guide Consider adding an example Dag that shows how users should use it.
  • Consider using Breeze environment for testing locally, it's a heavy docker but it ships with a working Airflow and a lot of integrations.
  • Be patient and persistent. It might take some time to get a review or get the final approval from Committers.
  • Please follow ASF Code of Conduct for all communication including (but not limited to) comments on Pull Requests, Mailing list and Slack.
  • Be sure to read the Airflow Coding style.
  • Always keep your Pull Requests rebased, otherwise your build might fail due to changes not related to your commits.
    Apache Airflow is a community-driven project and together we are making it better 🚀.
    In case of doubts contact the developers at:
    Mailing List: dev@airflow.apache.org
    Slack: https://s.apache.org/airflow-slack

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

DockerOperator: on_kill method does not respect auto_remove='force', leaving orphaned containers

1 participant