[23.0 backport] Lock container when deleting its root directory #47110
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
Attempting to delete the directory while another goroutine is concurrently executing a CheckpointTo() can fail on Windows due to file locking. As all callers of CheckpointTo() are required to hold the container lock, holding the lock while deleting the directory ensures that there will be no interference. Signed-off-by: Cory Snider <csnider@mirantis.com> (cherry picked from commit 18e322b) Signed-off-by: Cory Snider <csnider@mirantis.com>
corhere
added
area/runtime
platform/windows
kind/bugfix
vvoland
approved these changes
Jan 19, 2024
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.
- What I did
The test
TestDockerCLIRunSuite/TestRunContainerWithRmFlagCannotStartContainerhas been flaky in CI recently. The daemon logs reveal the smoking gun:Fix the test by cherry-picking a fix to make container deletion more reliable on Windows.
- How I did it
Attempting to delete the directory while another goroutine is concurrently executing a
CheckpointTo()can fail on Windows due to file locking. As all callers ofCheckpointTo()are required to hold the container lock, holding the lock while deleting the directory ensures that there will be no interference.- How to verify it
Ci is ✅
- Description for the changelog
- A picture of a cute animal (not mandatory but encouraged)