kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Do not recursive unmount on cleanup of zfs/btrfs

Browse source 
This was added in #36047 just as a way to make sure the tree is fully
unmounted on shutdown.

For ZFS this could be a breaking change since there was no unmount before.
Someone could have setup the zfs tree themselves. It would be better, if
we really do want the cleanup to actually the unpacked layers checking
for mounts rather than a blind recursive unmount of the root.

BTRFS does not use mounts and does not need to unmount anyway.
These was only an unmount to begin with because for some reason the
btrfs tree was being moutned with `private` propagation.

For the other graphdrivers that still have a recursive unmount here...
these were already being unmounted and performing the recursive unmount
shouldn't break anything. If anyone had anything mounted at the
graphdriver location it would have been unmounted on shutdown anyway.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
This commit is contained in:
Brian Goff 2018-02-07 14:49:20 -05:00
parent 53a58da551
commit 2fe4f888be
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
daemon/graphdriver/btrfs/btrfs.go
View file

@ -29,7 +29,6 @@ import (
"github.com/docker/docker/daemon/graphdriver"
"github.com/docker/docker/pkg/containerfs"
"github.com/docker/docker/pkg/idtools"
"github.com/docker/docker/pkg/mount"
"github.com/docker/docker/pkg/parsers"
"github.com/docker/docker/pkg/system"
"github.com/docker/go-units"
@ -163,7 +162,7 @@ func (d *Driver) Cleanup() error {
return err
}
return mount.RecursiveUnmount(d.home)
return nil
}
func free(p *C.char) {

5
daemon/graphdriver/zfs/zfs.go
View file

@ -178,9 +178,10 @@ func (d *Driver) String() string {
return "zfs"
}
// Cleanup is called on daemon shutdown, it is used to clean up any remaining mounts
// Cleanup is called on daemon shutdown, it is a no-op for ZFS.
// TODO(@cpuguy83): Walk layer tree and check mounts?
func (d *Driver) Cleanup() error {
return mount.RecursiveUnmount(d.options.mountPath)
return nil
}
// Status returns information about the ZFS filesystem. It returns a two dimensional array of information