Conversation
Copy the implementation of `context.WithoutCancel` introduced in Go 1.21 to be able to use it when building with older versions. This will use the stdlib directly when building with Go 1.21+. Signed-off-by: Paweł Gronowski <[email protected]> (cherry picked from commit f6e44bc) Signed-off-by: Sebastiaan van Stijn <[email protected]>
Log a warning if we encounter an error when releasing leases. While it may not have direct consequences, failing to release the lease should be unexpected, so let's make them visible. Signed-off-by: Sebastiaan van Stijn <[email protected]> (cherry picked from commit 28d201f) Signed-off-by: Sebastiaan van Stijn <[email protected]>
Also rename variables that collided with imports. Signed-off-by: Sebastiaan van Stijn <[email protected]> (cherry picked from commit aefbd49) Signed-off-by: Sebastiaan van Stijn <[email protected]>
Signed-off-by: Sebastiaan van Stijn <[email protected]> (cherry picked from commit e10eca3) Signed-off-by: Sebastiaan van Stijn <[email protected]>
Fixes leases not being released when operation was cancelled. Signed-off-by: Paweł Gronowski <[email protected]> (cherry picked from commit 6f27bef) Signed-off-by: Sebastiaan van Stijn <[email protected]>
thaJeztah
added
status/2-code-review
containerd-integration
Merged
2 tasks
vvoland
approved these changes
Oct 23, 2023
thaJeztah
deleted the
24.0_backport_c8d_push_defer_noncancellable_context
branch
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
2 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.
backports:
some small changes in this patch, because
logrusis still used in this branch.- Description for the changelog
- A picture of a cute animal (not mandatory but encouraged)