fix(archive): handle whiteout ancestors during root path resolution (#38) - #39
Merged
dinoallo merged 1 commit intoAug 3, 2026
Conversation
Copy link
Copy Markdown
Collaborator
Sorry, something went wrong.
…ontainerd#38) * fix(archive): handle whiteout ancestors during root path resolution * fix(archive): skip mtime replay for replaced dirs (cherry picked from commit 5a36943)
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
1 participant
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.
Background
Backport #38 from v1.7 to release/1.7+labring. Archive apply can fail with ENOTDIR before mkparent runs because fs.RootPath resolves parent paths first and can hit an overlay whiteout ancestor.
Changes
Risks / Notes
Only overlay whiteout character devices are replaced. Regular files, symlinks, and non-whiteout device nodes still fail as non-directory parents. This PR does not include a release tag.