daemon: use context.WithoutCancel in more places#46687
Merged
thaJeztah merged 2 commits intomoby:masterfrom Oct 20, 2023
Merged
daemon: use context.WithoutCancel in more places#46687thaJeztah merged 2 commits intomoby:masterfrom
thaJeztah merged 2 commits intomoby:masterfrom
Conversation
Follow-up to fc94ed0. Now that f6e44bc added the compatcontext package, we can start using context.WithoutCancel. Signed-off-by: Sebastiaan van Stijn <[email protected]>
Use context.WithoutCancel so that both the containerStop and container.Wait can share the same parent context. This context is still a "TODO", but can be wired up in future. It's worth noting that daemon.containerStop already uses context.WithoutCancel, so in that function, we'll be wrapping the context twice, but this should likely not cause issues (just redundant for this code-path). Signed-off-by: Sebastiaan van Stijn <[email protected]>
vvoland
approved these changes
Oct 20, 2023
rumpl
approved these changes
Oct 20, 2023
Member
Author
|
LOL, looks like I forgot updating the PR title from the "github generated one" to be something more meaningful; let me do so. |
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
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.
daemon: daemon.containerStop: use context.WithoutCancel
Follow-up to fc94ed0 (#45738). Now that
f6e44bc (#46552) added the compatcontext
package, we can start using context.WithoutCancel.
daemon: daemon.shutdownContainer: use context.WithoutCancel
Use context.WithoutCancel so that both the containerStop and
container.Wait can share the same parent context. This context is still
a "TODO", but can be wired up in future.
It's worth noting that daemon.containerStop already uses context.WithoutCancel,
so in that function, we'll be wrapping the context twice, but this should
likely not cause issues (just redundant for this code-path).
- Description for the changelog
- A picture of a cute animal (not mandatory but encouraged)