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

Merge pull request #36237 from cpuguy83/zfs_do_not_unmount

Browse source 
Do not recursive unmount on cleanup of zfs/btrfs
This commit is contained in:
Brian Goff 2018-02-14 09:49:17 -05:00 • committed by GitHub
commit 68c3201626
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
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/daemon/graphdriver"
"github.com/docker/docker/pkg/containerfs" "github.com/docker/docker/pkg/containerfs"
"github.com/docker/docker/pkg/idtools" "github.com/docker/docker/pkg/idtools"
"github.com/docker/docker/pkg/mount"
"github.com/docker/docker/pkg/parsers" "github.com/docker/docker/pkg/parsers"
"github.com/docker/docker/pkg/system" "github.com/docker/docker/pkg/system"
"github.com/docker/go-units" "github.com/docker/go-units"
@ -163,7 +162,7 @@ func (d *Driver) Cleanup() error {
return err return err
} }
return mount.RecursiveUnmount(d.home) return nil
} }
func free(p *C.char) { func free(p *C.char) {

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

@ -178,9 +178,10 @@ func (d *Driver) String() string {
return "zfs" 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 { 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 // Status returns information about the ZFS filesystem. It returns a two dimensional array of information