[docker-29.x backport] layer: Clean up init layer if initialization fails#51826
Merged
thaJeztah merged 2 commits intomoby:docker-29.xfrom Jan 8, 2026
Merged
Conversation
Add cleanup for the init layer directory if any operation fails after driver.CreateReadWrite() succeeds in initMount(). Previously, failures in driver.Get(), initFunc(), or driver.Put() would leave an orphaned overlay2 directory. Related to moby#45939 Signed-off-by: Jan Scheffler <jan.scheffler@qodev.ai> (cherry picked from commit 3fdde52) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com> (cherry picked from commit 26bb1af) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
robmry
approved these changes
Jan 8, 2026
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
4 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.
- What I did
Add cleanup for the init layer directory if any operation fails after
driver.CreateReadWrite()succeeds ininitMount(). Previously, failures indriver.Get(),initFunc(), ordriver.Put()would leave an orphaned overlay2 directory.Related to #45939
- How I did it
Added a defer-based cleanup with a success flag (same pattern as
registerWithDescriptor()). If any operation afterCreateReadWrite()fails, the init layer is removed.- How to verify it
go test ./daemon/internal/layer/...