[24.0 backport] daemon: fix panic on failed exec start#45794
Merged
neersighted merged 2 commits intomoby:24.0from Jun 23, 2023
Merged
[24.0 backport] daemon: fix panic on failed exec start#45794neersighted merged 2 commits intomoby:24.0from
neersighted merged 2 commits intomoby:24.0from
Conversation
Use `WithFields()` instead of chaining multiple `WithField()` calls. Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit de363f1) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
If an exec fails to start in such a way that containerd publishes an exit event for it, daemon.ProcessEvent will race daemon.ContainerExecStart in handling the failure. This race has been a long-standing bug, which was mostly harmless until 4bafaa0. After that change, the daemon would dereference a nil pointer and crash if ProcessEvent won the race. Restore the status quo buggy behaviour by adding a check to skip the dereference if execConfig.Process is nil. Signed-off-by: Cory Snider <csnider@mirantis.com> (cherry picked from commit 3b28a24) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Member
Author
|
@corhere @neersighted ptal (added one other commit for a clean cherry) |
neersighted
approved these changes
Jun 22, 2023
corhere
approved these changes
Jun 22, 2023
Member
Author
|
oh! Docker Hub having issues? |
Member
Author
|
^^ issue was related to a failed deploy earlier, and they were in the middle of rolling out some changes, which could cause some small time interruptions (so we were lucky to hit those) |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
backport of
If an exec fails to start in such a way that containerd publishes an exit event for it,
daemon.ProcessEventwill racedaemon.ContainerExecStartin handling the failure. This race has been a long-standing bug, which was mostly harmless until 4bafaa0. After that change, the daemon would dereference a nil pointer and crash ifProcessEventwon the race. Restore the status quo buggy behaviour by adding a check to skip the dereference ifexecConfig.Processis nil.- What I did
- How I did it
- How to verify it
- Description for the changelog
- A picture of a cute animal (not mandatory but encouraged)