Skip to content

/ moby

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove btrfs quota groups after containers destroyed #29427

Merged
merged 2 commits into from Jun 6, 2017
Merged

Remove btrfs quota groups after containers destroyed #29427

merged 2 commits into from Jun 6, 2017

Conversation

@yongtang
Copy link
Member

yongtang commented Dec 14, 2016 •
edited

- What I did

This fix tries to address the issue raised in #29325 where btrfs quota groups are not clean up even after containers have been destroyed.

- How I did it

The reason for the issue is that btrfs quota groups have to be explicitly destroyed. This fix fixes this issue.

- How to verify it

This fix is tested manually in Ubuntu 16.04:

pre-fix behavior with qgroup leftover:

ubuntu@ubuntu:~$ docker pull busybox
Using default tag: latest
latest: Pulling from library/busybox
4b0bc1c4050b: Pull complete
Digest: sha256:817a12c32a39bbe394944ba49de563e085f1d3c5266eb8e9723256bc4448680e
Status: Downloaded newer image for busybox:latest
ubuntu@ubuntu:~$
ubuntu@ubuntu:~$
ubuntu@ubuntu:~$ sudo btrfs qgroup show /var/lib/docker/btrfs
qgroupid         rfer         excl
--------         ----         ----
0/5         128.00KiB    128.00KiB
0/257       112.00KiB    112.00KiB
ubuntu@ubuntu:~$
ubuntu@ubuntu:~$
ubuntu@ubuntu:~$ docker run --name top -d busybox top
b59e6e3da6ed3e601f081c11c44d3f4dd44aefee5584d34ba913e68207c9694d
ubuntu@ubuntu:~$
ubuntu@ubuntu:~$
ubuntu@ubuntu:~$ sudo btrfs qgroup show /var/lib/docker/btrfs
qgroupid         rfer         excl
--------         ----         ----
0/5         128.00KiB    128.00KiB
0/257         1.17MiB     64.00KiB
0/258         1.17MiB     16.00KiB
0/259         1.17MiB     16.00KiB
ubuntu@ubuntu:~$
ubuntu@ubuntu:~$
ubuntu@ubuntu:~$ docker rm -f top
top
ubuntu@ubuntu:~$
ubuntu@ubuntu:~$
ubuntu@ubuntu:~$ docker ps -a
CONTAINER ID        IMAGE               COMMAND             CREATED             STATUS              PORTS               NAMES
ubuntu@ubuntu:~$
ubuntu@ubuntu:~$
ubuntu@ubuntu:~$ sudo btrfs qgroup show /var/lib/docker/btrfs
qgroupid         rfer         excl
--------         ----         ----
0/5         144.00KiB    144.00KiB
0/257         1.17MiB      1.17MiB
0/258           0.00B        0.00B
0/259           0.00B        0.00B

PR with qgroup cleaned (non --live-restore case):

ubuntu@ubuntu:~$ docker pull busybox
Using default tag: latest
latest: Pulling from library/busybox
4b0bc1c4050b: Pull complete
Digest: sha256:817a12c32a39bbe394944ba49de563e085f1d3c5266eb8e9723256bc4448680e
Status: Downloaded newer image for busybox:latest
ubuntu@ubuntu:~$
ubuntu@ubuntu:~$
ubuntu@ubuntu:~$ sudo btrfs qgroup show /var/lib/docker/btrfs
qgroupid         rfer         excl
--------         ----         ----
0/5         128.00KiB    128.00KiB
0/257       112.00KiB    112.00KiB
ubuntu@ubuntu:~$
ubuntu@ubuntu:~$
ubuntu@ubuntu:~$ docker run --name top -d busybox top
201d444f74943247c7794fae2215f763cad0dd726d03285004c54ffa04882d6b
ubuntu@ubuntu:~$
ubuntu@ubuntu:~$
ubuntu@ubuntu:~$ sudo btrfs qgroup show /var/lib/docker/btrfs
qgroupid         rfer         excl
--------         ----         ----
0/5         128.00KiB    128.00KiB
0/257         1.17MiB     64.00KiB
0/258         1.17MiB     16.00KiB
0/259         1.17MiB     16.00KiB
ubuntu@ubuntu:~$
ubuntu@ubuntu:~$
ubuntu@ubuntu:~$ docker rm -f top
top
ubuntu@ubuntu:~$
ubuntu@ubuntu:~$
ubuntu@ubuntu:~$ docker ps -a
CONTAINER ID        IMAGE               COMMAND             CREATED             STATUS              PORTS               NAMES
ubuntu@ubuntu:~$
ubuntu@ubuntu:~$
ubuntu@ubuntu:~$ sudo btrfs qgroup show /var/lib/docker/btrfs
qgroupid         rfer         excl
--------         ----         ----
0/5         144.00KiB    144.00KiB
0/257         1.17MiB      1.17MiB

PR with qgroup cleaned (--live-restore case):

# [sudo dockerd --debug --live-restore -s btrfs --storage-opt btrfs.min_space=1G]

ubuntu@ubuntu:~$ docker pull busybox
Using default tag: latest
latest: Pulling from library/busybox
4b0bc1c4050b: Pull complete
Digest: sha256:817a12c32a39bbe394944ba49de563e085f1d3c5266eb8e9723256bc4448680e
Status: Downloaded newer image for busybox:latest
ubuntu@ubuntu:~$
ubuntu@ubuntu:~$
ubuntu@ubuntu:~$ sudo btrfs qgroup show /var/lib/docker/btrfs
qgroupid         rfer         excl
--------         ----         ----
0/5         128.00KiB    128.00KiB
0/257       112.00KiB    112.00KiB
ubuntu@ubuntu:~$
ubuntu@ubuntu:~$
ubuntu@ubuntu:~$ docker run --name top -d busybox top
73c2184a4414d47b5f5dc27cd2ee28116aa761f947196618ca66bf05c4705456
ubuntu@ubuntu:~$
ubuntu@ubuntu:~$
ubuntu@ubuntu:~$ sudo btrfs qgroup show /var/lib/docker/btrfs
qgroupid         rfer         excl
--------         ----         ----
0/5         128.00KiB    128.00KiB
0/257         1.17MiB     64.00KiB
0/258         1.17MiB     16.00KiB
0/259         1.17MiB     16.00KiB
ubuntu@ubuntu:~$
ubuntu@ubuntu:~$

# [Ctrl-C ]
# [sudo dockerd --debug --live-restore -s btrfs]

ubuntu@ubuntu:~$
ubuntu@ubuntu:~$
ubuntu@ubuntu:~$ docker ps -a
CONTAINER ID        IMAGE               COMMAND             CREATED              STATUS              PORTS               NAMES
73c2184a4414        busybox             "top"               About a minute ago   Up About a minute                       top
ubuntu@ubuntu:~$
ubuntu@ubuntu:~$
ubuntu@ubuntu:~$ sudo btrfs qgroup show /var/lib/docker/btrfs
qgroupid         rfer         excl
--------         ----         ----
0/5         152.00KiB    152.00KiB
0/257         1.17MiB     64.00KiB
0/258         1.17MiB     48.00KiB
0/259         1.17MiB     48.00KiB
ubuntu@ubuntu:~$
ubuntu@ubuntu:~$
ubuntu@ubuntu:~$ docker rm -f top
top
ubuntu@ubuntu:~$
ubuntu@ubuntu:~$
ubuntu@ubuntu:~$ docker ps -a
CONTAINER ID        IMAGE               COMMAND             CREATED             STATUS              PORTS               NAMES
ubuntu@ubuntu:~$
ubuntu@ubuntu:~$
ubuntu@ubuntu:~$ sudo btrfs qgroup show /var/lib/docker/btrfs
qgroupid         rfer         excl
--------         ----         ----
0/5         168.00KiB    168.00KiB
0/257         1.17MiB     64.00KiB

- Description for the changelog

- A picture of a cute animal (not mandatory but encouraged)

c03904d6028381a6bd0d1b1bfd1523bb

This fix fixes #29325.

Signed-off-by: Yong Tang yong.tang.github@outlook.com
@yongtang yongtang force-pushed the yongtang:29325-cleanup-btrfs-quota-groups branch 2 times, most recently from 421140b to 57c74de Dec 14, 2016
@yongtang
Copy link
Member Author

yongtang commented Dec 19, 2016

/cc @justincormack @mlaventure
@yongtang yongtang mentioned this pull request Dec 19, 2016
Closed
@zhuguihua
Copy link
Contributor

zhuguihua commented Dec 28, 2016

Sorry for late reply. LGTM.
@yongtang yongtang force-pushed the yongtang:29325-cleanup-btrfs-quota-groups branch from 57c74de to 44dee9c Jan 3, 2017
@yongtang
Copy link
Member Author

yongtang commented Jan 3, 2017

Previously the PR didn't take into consideration that, if quotaEnabled is false, there is no need to clean up the qgroup (See #29810 for similar issue)

Now the PR has been updated to add the check for quotaEnabled.
@thaJeztah
Copy link
Member

thaJeztah commented Jan 3, 2017

Also wondering the same here as on #29835 (comment)
@mlaventure
Copy link
Contributor

mlaventure commented Jan 3, 2017

I had a quick look at the code, it looks like @thaJeztah may be correct.

Would wait on @cpuguy83 for confirmation
@thaJeztah
Copy link
Member

thaJeztah commented Jan 3, 2017

if I'm correct, we may need some mechanism to detect if a quota is set (perhaps querying btrfs), otherwise it's possible we don't know when to cleanup / manage quotas
@cpuguy83
Copy link
Contributor

cpuguy83 commented Jan 3, 2017

I think you are right. On daemon restore it could really be a problem.
@LK4D4
Copy link
Contributor

LK4D4 commented Jan 26, 2017

@cpuguy83 @tonistiigi @yongtang so, what we're going to do with this and #29385
If we have no proper solution for now, I propose to close PRs.
Thanks!
@yongtang
Copy link
Member Author

yongtang commented Jan 26, 2017

@cpuguy83 @tonistiigi @LK4D4 This PR (#29427) and the other PR (#29835) are related.

I updated the other PR #29835 first to try to address the issue by looking up the qgroup and see if it returns something.

Please take a look at the (#29835) first and see if it address the concerns.
@yongtang yongtang force-pushed the yongtang:29325-cleanup-btrfs-quota-groups branch from 44dee9c to ba10de8 Jan 27, 2017
@yongtang
Copy link
Member Author

yongtang commented Jan 28, 2017

Here is the complete steps to verify that the issue is fixed (Including --live-restore case).

Would be good to setup integration test for btrfs in Jenkins

Note: this PR has been updated to incorporate #30497. If this one is merged then #30497 could be closed

pre-fix behavior with qgroup leftover:

ubuntu@ubuntu:~$ docker pull busybox
Using default tag: latest
latest: Pulling from library/busybox
4b0bc1c4050b: Pull complete
Digest: sha256:817a12c32a39bbe394944ba49de563e085f1d3c5266eb8e9723256bc4448680e
Status: Downloaded newer image for busybox:latest
ubuntu@ubuntu:~$
ubuntu@ubuntu:~$
ubuntu@ubuntu:~$ sudo btrfs qgroup show /var/lib/docker/btrfs
qgroupid         rfer         excl
--------         ----         ----
0/5         128.00KiB    128.00KiB
0/257       112.00KiB    112.00KiB
ubuntu@ubuntu:~$
ubuntu@ubuntu:~$
ubuntu@ubuntu:~$ docker run --name top -d busybox top
b59e6e3da6ed3e601f081c11c44d3f4dd44aefee5584d34ba913e68207c9694d
ubuntu@ubuntu:~$
ubuntu@ubuntu:~$
ubuntu@ubuntu:~$ sudo btrfs qgroup show /var/lib/docker/btrfs
qgroupid         rfer         excl
--------         ----         ----
0/5         128.00KiB    128.00KiB
0/257         1.17MiB     64.00KiB
0/258         1.17MiB     16.00KiB
0/259         1.17MiB     16.00KiB
ubuntu@ubuntu:~$
ubuntu@ubuntu:~$
ubuntu@ubuntu:~$ docker rm -f top
top
ubuntu@ubuntu:~$
ubuntu@ubuntu:~$
ubuntu@ubuntu:~$ docker ps -a
CONTAINER ID        IMAGE               COMMAND             CREATED             STATUS              PORTS               NAMES
ubuntu@ubuntu:~$
ubuntu@ubuntu:~$
ubuntu@ubuntu:~$ sudo btrfs qgroup show /var/lib/docker/btrfs
qgroupid         rfer         excl
--------         ----         ----
0/5         144.00KiB    144.00KiB
0/257         1.17MiB      1.17MiB
0/258           0.00B        0.00B
0/259           0.00B        0.00B

PR with qgroup cleaned (non --live-restore case):

ubuntu@ubuntu:~$ docker pull busybox
Using default tag: latest
latest: Pulling from library/busybox
4b0bc1c4050b: Pull complete
Digest: sha256:817a12c32a39bbe394944ba49de563e085f1d3c5266eb8e9723256bc4448680e
Status: Downloaded newer image for busybox:latest
ubuntu@ubuntu:~$
ubuntu@ubuntu:~$
ubuntu@ubuntu:~$ sudo btrfs qgroup show /var/lib/docker/btrfs
qgroupid         rfer         excl
--------         ----         ----
0/5         128.00KiB    128.00KiB
0/257       112.00KiB    112.00KiB
ubuntu@ubuntu:~$
ubuntu@ubuntu:~$
ubuntu@ubuntu:~$ docker run --name top -d busybox top
201d444f74943247c7794fae2215f763cad0dd726d03285004c54ffa04882d6b
ubuntu@ubuntu:~$
ubuntu@ubuntu:~$
ubuntu@ubuntu:~$ sudo btrfs qgroup show /var/lib/docker/btrfs
qgroupid         rfer         excl
--------         ----         ----
0/5         128.00KiB    128.00KiB
0/257         1.17MiB     64.00KiB
0/258         1.17MiB     16.00KiB
0/259         1.17MiB     16.00KiB
ubuntu@ubuntu:~$
ubuntu@ubuntu:~$
ubuntu@ubuntu:~$ docker rm -f top
top
ubuntu@ubuntu:~$
ubuntu@ubuntu:~$
ubuntu@ubuntu:~$ docker ps -a
CONTAINER ID        IMAGE               COMMAND             CREATED             STATUS              PORTS               NAMES
ubuntu@ubuntu:~$
ubuntu@ubuntu:~$
ubuntu@ubuntu:~$ sudo btrfs qgroup show /var/lib/docker/btrfs
qgroupid         rfer         excl
--------         ----         ----
0/5         144.00KiB    144.00KiB
0/257         1.17MiB      1.17MiB

PR with qgroup cleaned (--live-restore case):

# [sudo dockerd --debug --live-restore -s btrfs --storage-opt btrfs.min_space=1G]

ubuntu@ubuntu:~$ docker pull busybox
Using default tag: latest
latest: Pulling from library/busybox
4b0bc1c4050b: Pull complete
Digest: sha256:817a12c32a39bbe394944ba49de563e085f1d3c5266eb8e9723256bc4448680e
Status: Downloaded newer image for busybox:latest
ubuntu@ubuntu:~$
ubuntu@ubuntu:~$
ubuntu@ubuntu:~$ sudo btrfs qgroup show /var/lib/docker/btrfs
qgroupid         rfer         excl
--------         ----         ----
0/5         128.00KiB    128.00KiB
0/257       112.00KiB    112.00KiB
ubuntu@ubuntu:~$
ubuntu@ubuntu:~$
ubuntu@ubuntu:~$ docker run --name top -d busybox top
73c2184a4414d47b5f5dc27cd2ee28116aa761f947196618ca66bf05c4705456
ubuntu@ubuntu:~$
ubuntu@ubuntu:~$
ubuntu@ubuntu:~$ sudo btrfs qgroup show /var/lib/docker/btrfs
qgroupid         rfer         excl
--------         ----         ----
0/5         128.00KiB    128.00KiB
0/257         1.17MiB     64.00KiB
0/258         1.17MiB     16.00KiB
0/259         1.17MiB     16.00KiB
ubuntu@ubuntu:~$
ubuntu@ubuntu:~$

# [Ctrl-C ]
# [sudo dockerd --debug --live-restore -s btrfs]

ubuntu@ubuntu:~$
ubuntu@ubuntu:~$
ubuntu@ubuntu:~$ docker ps -a
CONTAINER ID        IMAGE               COMMAND             CREATED              STATUS              PORTS               NAMES
73c2184a4414        busybox             "top"               About a minute ago   Up About a minute                       top
ubuntu@ubuntu:~$
ubuntu@ubuntu:~$
ubuntu@ubuntu:~$ sudo btrfs qgroup show /var/lib/docker/btrfs
qgroupid         rfer         excl
--------         ----         ----
0/5         152.00KiB    152.00KiB
0/257         1.17MiB     64.00KiB
0/258         1.17MiB     48.00KiB
0/259         1.17MiB     48.00KiB
ubuntu@ubuntu:~$
ubuntu@ubuntu:~$
ubuntu@ubuntu:~$ docker rm -f top
top
ubuntu@ubuntu:~$
ubuntu@ubuntu:~$
ubuntu@ubuntu:~$ docker ps -a
CONTAINER ID        IMAGE               COMMAND             CREATED             STATUS              PORTS               NAMES
ubuntu@ubuntu:~$
ubuntu@ubuntu:~$
ubuntu@ubuntu:~$ sudo btrfs qgroup show /var/lib/docker/btrfs
qgroupid         rfer         excl
--------         ----         ----
0/5         168.00KiB    168.00KiB
0/257         1.17MiB     64.00KiB
@yongtang yongtang mentioned this pull request Feb 10, 2017
Closed
@mlaventure
mlaventure reviewed Feb 10, 2017
View changes
daemon/graphdriver/btrfs/btrfs.go Outdated
@@ -320,7 +337,7 @@ func (d *Driver) subvolEnableQuota() error {
func (d *Driver) subvolDisableQuota() error {
if !d.quotaEnabled {

This comment has been minimized.

Sign in to view
@mlaventure

mlaventure Feb 10, 2017

Contributor

Shouldn't this be turned into a isQuotaEnabled() routine to avoid this code to be duplicated?

Also, quotaEnabled is just a boolean, but don't we need a lock around it?
@mlaventure
Copy link
Contributor

mlaventure commented Feb 10, 2017

ping @cpuguy83 @tonistiigi
@yongtang yongtang force-pushed the yongtang:29325-cleanup-btrfs-quota-groups branch 2 times, most recently from d7f3c09 to 4d312d6 Feb 13, 2017
@yongtang
Copy link
Member Author

yongtang commented Feb 13, 2017

Thanks @mlaventure for the review. The PR has been updated with isQuotaEnabled() and lock added. Please take a look and let me know if there are any issues.
@vdemeester vdemeester added this to the 1.14.0 milestone Feb 13, 2017
@mlaventure
mlaventure reviewed Feb 13, 2017
View changes
daemon/graphdriver/btrfs/btrfs.go Outdated
}

func (d *Driver) subvolEnableQuota() error {
d.mu.Lock()

This comment has been minimized.

Sign in to view
@mlaventure

mlaventure Feb 13, 2017

Contributor

move the lock in isQuotaEnabled?

This comment has been minimized.

Sign in to view
@yongtang

yongtang Feb 13, 2017

Author Member

Thanks @mlaventure.

Inside the subvolEnableQuota the d.quotaEnabled will be changed again to true at the end of subvolEnableQuota (located in Line 343). For that I placed the Lock() outside of isQuotaEnabled().

This comment has been minimized.

Sign in to view
@mlaventure

mlaventure Feb 13, 2017

Contributor

Oh, my bad. Thanks for clarifying.
@mlaventure
Copy link
Contributor

mlaventure commented Mar 3, 2017

ping @cpuguy83 @tonistiigi this is waiting for reviews 👼
@thaJeztah
Copy link
Member

thaJeztah commented Mar 15, 2017

ping @cpuguy83 @tonistiigi PTAL
@cpuguy83
Copy link
Contributor

cpuguy83 commented Apr 5, 2017

This is not re-applying qutoas on daemon restart.

$ docker run -d --name test --storage-opt size=100m busybox top
$ docker exec test sh -c 'dd if=/dev/urandom of=/data bs=1 count=200' # errors around 100M
$ # restart docker
$ # note that `btrfs qgroup show` does not find the qgroup
$ docker start test
$ # note still no qgroup
$ docker exec test sh -c 'dd if=/dev/urandom of=/data bs=1 count=200'  # write successful, no qutoa
@cpuguy83
Copy link
Contributor

cpuguy83 commented Apr 5, 2017

It looks like we need to rescan for quota in Get()... or not disable quota on Cleanup()
@cpuguy83
Copy link
Contributor

cpuguy83 commented Apr 5, 2017

Or I guess write out a file to trigger an auto-enable of the quota on restart.
@mlaventure
Copy link
Contributor

mlaventure commented Apr 25, 2017

ping @yongtang 👼
@thaJeztah
Copy link
Member

thaJeztah commented May 12, 2017

ping @yongtang do you still have time to work on this?
@thaJeztah thaJeztah modified the milestones: 17.06.0, 17.05.0 May 12, 2017
@yongtang
Copy link
Member Author

yongtang commented May 13, 2017

@thaJeztah Sorry for the late response. Let me spend the next several days to get this one fixed.
@yongtang yongtang force-pushed the yongtang:29325-cleanup-btrfs-quota-groups branch 2 times, most recently from 8106d15 to 9792f99 May 24, 2017
@yongtang
Copy link
Member Author

yongtang commented May 25, 2017

@cpuguy83 The PR has been updated. Now the quota is saved in /lib/var/docker/btrfs/quotas and recovered in case of a daemon restart. Not sure this is the best place to persist so any suggestions would be greatly appreciated. Please take a look.
@thaJeztah
Copy link
Member

thaJeztah commented May 30, 2017

ping @cpuguy83

also @cyphar, who may be interested in this 😃
@sargun
Copy link
Contributor

sargun commented May 30, 2017

Alternatively, you can just wait for this patchset to land: http://www.spinics.net/lists/linux-btrfs/msg65928.html
@thaJeztah
Copy link
Member

thaJeztah commented May 31, 2017

@sargun nice! Unfortunately we don't control the host, so cannot guarantee that patch is present on each distro / version, so not sure we can rely on that
@cpuguy83
cpuguy83 requested changes May 31, 2017
View changes
daemon/graphdriver/btrfs/btrfs.go Outdated
if quota, err := ioutil.ReadFile(d.quotasDirID(id)); err == nil {
if size, err := strconv.ParseUint(string(quota), 10, 64); err == nil && size >= d.options.minSpace {
d.subvolEnableQuota()
subvolLimitQgroup(dir, size)

This comment has been minimized.

Sign in to view
@cpuguy83

cpuguy83 May 31, 2017

Contributor

error check?

This comment has been minimized.

Sign in to view
@yongtang

yongtang Jun 2, 2017

Author Member

Done.
daemon/graphdriver/btrfs/btrfs.go Outdated
@@ -557,6 +635,13 @@ func (d *Driver) Get(id, mountLabel string) (string, error) {
return "", fmt.Errorf("%s: not a directory", dir)
}

if quota, err := ioutil.ReadFile(d.quotasDirID(id)); err == nil {
if size, err := strconv.ParseUint(string(quota), 10, 64); err == nil && size >= d.options.minSpace {
d.subvolEnableQuota()

This comment has been minimized.

Sign in to view
@cpuguy83

cpuguy83 May 31, 2017

Contributor

error check?

This comment has been minimized.

Sign in to view
@yongtang

yongtang Jun 2, 2017

Author Member

Done.
daemon/graphdriver/btrfs/btrfs.go Outdated
@@ -533,7 +606,12 @@ func (d *Driver) Remove(id string) error {
if _, err := os.Stat(dir); err != nil {
return err
}
if err := subvolDelete(d.subvolumesDir(), id); err != nil {
os.Remove(d.quotasDirID(id))

This comment has been minimized.

Sign in to view
@cpuguy83

cpuguy83 May 31, 2017

Contributor

error check?

This comment has been minimized.

Sign in to view
@yongtang

yongtang Jun 2, 2017

Author Member

Thanks @cpuguy83. Done.
daemon/graphdriver/btrfs/btrfs.go Outdated
if err := idtools.MkdirAllAs(quotas, 0700, rootUID, rootGID); err != nil {
return err
}
if err := ioutil.WriteFile(path.Join(quotas, id), []byte(fmt.Sprint(driver.options.size)), 0666); err != nil {

This comment has been minimized.

Sign in to view
@cpuguy83

cpuguy83 May 31, 2017

Contributor

644?

This comment has been minimized.

Sign in to view
@yongtang

yongtang Jun 2, 2017

Author Member

Thanks @cpuguy83. The PR has been updated.
yongtang added 2 commits Dec 14, 2016
@yongtang
Remove btrfs quota groups after containers destroyed
e907c64 
This fix tries to address the issue raised in 29325 where
btrfs quota groups are not clean up even after containers
have been destroyed.

The reason for the issue is that btrfs quota groups have
to be explicitly destroyed. This fix fixes this issue.

This fix is tested manually in Ubuntu 16.04,
with steps specified in 29325.

This fix fixes 29325.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
@yongtang
Persist the quota size for btrfs so that daemon restart keeps quota
Loading status checks…
16328cc 
This commit is an extension of fix for 29325 based on the review comment.
In this commit, the quota size for btrfs is kept in `/var/lib/docker/btrfs/quotas`
so that a daemon restart keeps quota.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
@yongtang yongtang force-pushed the yongtang:29325-cleanup-btrfs-quota-groups branch from 9792f99 to 16328cc Jun 2, 2017
@yongtang
Copy link
Member Author

yongtang commented Jun 2, 2017

Thanks @cpuguy83 for the review. The PR has been updated. Please take a look.
@cpuguy83
cpuguy83 approved these changes Jun 5, 2017
View changes
Copy link
Contributor

cpuguy83 left a comment

LGTM
@yongtang yongtang added the rebuild/z label Jun 6, 2017
@yongtang
Copy link
Member Author

yongtang commented Jun 6, 2017

All tests passed now, merging...
@yongtang yongtang merged commit 54dacaf into moby:master Jun 6, 2017
6 checks passed
6 checks passed
dco-signed All commits are signed
experimental Jenkins build Docker-PRs-experimental 34679 has succeeded
Details
janky Jenkins build Docker-PRs 43275 has succeeded
Details
powerpc Jenkins build Docker-PRs-powerpc 3664 has succeeded
Details
windowsRS1 Jenkins build Docker-PRs-WoW-RS1 14562 has succeeded
Details
z Jenkins build Docker-PRs-s390x 3498 has succeeded
Details
@yongtang yongtang deleted the yongtang:29325-cleanup-btrfs-quota-groups branch Jun 6, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mlaventure mlaventure

@vdemeester vdemeester

@cpuguy83 cpuguy83

Assignees

@mlaventure mlaventure

Labels
area/storage/btrfs status/2-code-review
Projects
None yet
Milestone
17.06.0
Linked issues

Successfully merging this pull request may close these issues.

Docker does not remove Btrfs quota groups when destroying container
10 participants
@yongtang @zhuguihua @thaJeztah @mlaventure @cpuguy83 @LK4D4 @tonistiigi @sargun @vdemeester @GordonTheTurtle
You can’t perform that action at this time.