BACKPORT: Overlay2 Quota Support#273
Merged
runcom merged 5 commits intoprojectatomic:docker-1.12.6from Sep 20, 2017
Merged
Conversation
Upstream commit: f65fa1f we see a lot of ``` level=debug msg="Failed to unmount a03b1bb6f569421857e5407d73d89451f92724674caa56bfc2170de7e585a00b-init overlay: device or resource busy" ``` in daemon logs and there is a lot of mountpoint leftover. This cause failed to remove container. Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream commit: 52897d1 This class implements XFS project quota controls for setting quota limits on a newly created directory. It currently supports the legacy XFS specific ioctls. Using this class, quota limits per container can be set by directory based storage drivers (e.g. overlay), when backing storage is XFS mounted with 'pquota' mount option. TODO: use generic quota control ioctl FS_IOC_FS{GET,SET}XATTR for both xfs/ext4 for kernel version >= v4.5 Signed-off-by: Amir Goldstein <amir73il@aquasec.com> Signed-off-by: albam.c <albam.c@navercorp.com>
Upstream commit: 9ea5071 In kernel version >= v4.5 the project quota ioctl definitions have been made public via the include/uapi/linux/fs.h API, so that ext4 could use the same API. Avoid re-defining the ioctl API if it is already defined in fs.h. Signed-off-by: Amir Goldstein <amir73il@aquasec.com>
Upstream commit: 05bac45 Allow passing --storage-opt size=X to docker create/run commands for the `overlay2` graphriver. The size option is only available if the backing fs is xfs that is mounted with the `pquota` mount option. The user can pass any size less then the backing fs size. Signed-off-by: Amir Goldstein <amir73il@aquasec.com>
Upstream commit: a63d5bc This commit adds the overlay2.size option to the daemon daemon storage opts. The user can override this option by the "docker run --storage-opt" options. Signed-off-by: Dhawal Yogesh Bhanushali <dbhanushali@vmware.com>
Author
Author
|
cc @mbarnes |
Collaborator
|
LGTM |
1 similar comment
Member
|
LGTM |
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
3 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.
Backport patches from upstream for supporting quota on overlay2.