Fix VFS vs quota regression #35827
Merged
Fix VFS vs quota regression #35827
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
If mknod() returns ENOSYS, it most probably means quota is not supported here, so return the appropriate error. This is a conservative* fix to regression in vfs graph driver introduced by commit 7a1618c ("add quota support to VFS graphdriver"). On some filesystems, vfs fails to init with the following error: > Error starting daemon: error initializing graphdriver: Failed to mknod > /go/src/github.com/docker/docker/bundles/test-integration/d6bcf6de610e9/root/vfs/backingFsBlockDev: > function not implemented Reported-by: Brian Goff <[email protected]> Signed-off-by: Kir Kolyshkin <[email protected]>
|
Now this is a rather conservative fix, only making |
|
@kolyshkin I would change to making it so that any error returned from initializing quota in the VFS driver code marks it as quota not supported. It'd also fix the user namespaces case in a general way. |
|
@sargun makes sense. I will keep this patch (as it makes sense for other graphdrivers, too) and add another one. |
This is a fix to regression in vfs graph driver introduced by commit 7a1618c ("add quota support to VFS graphdriver"). On some filesystems, vfs fails to init with the following error: > Error starting daemon: error initializing graphdriver: Failed to mknod > /go/src/github.com/docker/docker/bundles/test-integration/d6bcf6de610e9/root/vfs/backingFsBlockDev: > function not implemented As quota is not essential for vfs, let's ignore (but log as a warning) any error from quota init. Signed-off-by: Kir Kolyshkin <[email protected]>
|
LGTM. |
|
All tests passed now, including |
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
Fixed #35815
- How I did it
ENOSYSfrommknod()is now treated as "quota not supported".quota.NewControl()are now ignored (and logged).- How to verify it
Start daemon with vfs driver backed by osxfs
- Description for the changelog
Fix vfs graph driver failure to initialize because of failure to setup fs quota