[20.10 backport] daemon: kill exec process on ctx cancel #44018
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Terminating the exec process when the context is canceled has been broken since Docker v17.11 so nobody has been able to depend upon that behaviour in five years of releases. We are thus free from backwards- compatibility constraints. conflicts: - minor conflict in daemon/exec.go, as 2ec2b65 is not in the 20.10 branch, so had to cast the signal to an int. - minor conflict in daemon/health.go, where a comment was updated, which was added in bdc6473, which is not in the 20.10 branch - remove the skip.If() from TestHealthCheckProcessKilled, as the 20.10 branch is not testing on Windows with containerd (and the RuntimeIsWindowsContainerd does not exist), but kept a "FIXME" comment. Co-authored-by: Nicolas De Loof <nicolas.deloof@gmail.com> Co-authored-by: Sebastiaan van Stijn <github@gone.nl> Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com> Signed-off-by: Cory Snider <csnider@mirantis.com> Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 4b84a33) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
thaJeztah
changed the title
AkihiroSuda
approved these changes
Aug 24, 2022
samuelkarp
approved these changes
Aug 25, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Terminating the exec process when the context is canceled has been
broken since Docker v17.11 so nobody has been able to depend upon that
behaviour in five years of releases. We are thus free from backwards-
compatibility constraints.
conflicts:
is not in the 20.10 branch, so had to cast the signal to an int.
added in bdc6473, which is not in the
20.10 branch
is not testing on Windows with containerd (and the RuntimeIsWindowsContainerd
does not exist), but kept a "FIXME" comment.
(cherry picked from commit 4b84a33)
- Description for the changelog
- A picture of a cute animal (not mandatory but encouraged)