rootless: overlay2: fix "createDirWithOverlayOpaque(...) ... input/output error"#42188
Merged
tiborvass merged 3 commits intomoby:masterfrom Apr 1, 2021
Merged
Conversation
AkihiroSuda
added
area/rootless
This was referenced Mar 23, 2021
AkihiroSuda
requested review from
dmcgowan,
thaJeztah,
tiborvass and
tonistiigi
AkihiroSuda
force-pushed
the
fix-overlay2-naivediff
branch
from
1ce9143 to
6f788a4
Compare
thaJeztah
reviewed
Mar 23, 2021
Member
Previously, `d.naiveDiff.ApplyDiff` was not used even when `useNaiveDiff()==true` Signed-off-by: Akihiro Suda <[email protected]>
AkihiroSuda
force-pushed
the
fix-overlay2-naivediff
branch
from
6f788a4 to
7bb213d
Compare
kolyshkin
reviewed
Mar 26, 2021
When running in userns, returns error (i.e. "use naive, not native") immediately. No substantial change to the logic. Signed-off-by: Akihiro Suda <[email protected]>
overlay2 no longer sets `archive.OverlayWhiteoutFormat` when running in UserNS, so we can remove the complicated logic in the archive package. Signed-off-by: Akihiro Suda <[email protected]>
AkihiroSuda
force-pushed
the
fix-overlay2-naivediff
branch
from
7bb213d to
6322dfc
Compare
thaJeztah
approved these changes
Apr 1, 2021
Member
thaJeztah
left a comment
thaJeztah
left a comment
There was a problem hiding this comment.
LGTM
I want to have a look at #42188 (comment) after this is merged; I have a feeling we are loading the driver in situations where we shouldn't (so possible could skip the driver as a whole on initialization, but have to continue following the code paths)
Member
Author
|
Two LGTMs, can we merge? |
Contributor
|
@AkihiroSuda sure we can merge but can you please change the Changelog line to something that encompasses (or enumerates) the user-facing fixes it provides? Something I can copy/paste that doesn't explain internal source code changes. |
Contributor
|
@AkihiroSuda |
Member
Author
|
Changed to |
AkihiroSuda
changed the title
Contributor
|
Is it fair to assume that the following failure is unrelated? |
Contributor
|
From the daemon logs: this does look unrelated. |
Contributor
|
@AkihiroSuda feel free to backport |
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
Fix
createDirWithOverlayOpaque(...) ... input/output erroron rootless.Fix docker/for-linux#1055 (intermittent error, on Debian 10, kernel < 5.11)
Fix #42177 (100% reproducible error, on kernel >= 5.11)
Fix #42206
- How I did it
[bug fix] Commit 1:
overlay2: call d.naiveDiff.ApplyDiff when useNaiveDiff==truePreviously,
d.naiveDiff.ApplyDiffwas not used even whenuseNaiveDiff()==true[optimization] Commit 2:
overlay2: doesSupportNativeDiff: add fast path for usernsWhen running in userns, returns error (i.e. "use naive, not native") immediately.
No substantial change to the logic.
[clean up] Commit 3:
archive: do not use overlayWhiteoutConverter for UserNSoverlay2 no longer sets
archive.OverlayWhiteoutFormatwhen running in UserNS, so we can remove the complicated logic in the archive package.- How to verify it
$ docker --context=rootless pull python:3.9- Description for the changelog
rootless: overlay2: fix "createDirWithOverlayOpaque(...) ... input/output error"
- A picture of a cute animal (not mandatory but encouraged)
🐧