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 #36047 from cpuguy83/graphdriver_improvements

Browse source 
Do not make graphdriver homes private mounts.
This commit is contained in:
Michael Crosby 2018-01-26 13:54:30 -05:00 committed by GitHub
commit 2c05aefc99
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 7 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
daemon/graphdriver/aufs/aufs.go
View file

@ -136,10 +136,6 @@ func Init(root string, options []string, uidMaps, gidMaps []idtools.IDMap) (grap
return nil, err
}
if err := mountpk.MakePrivate(root); err != nil {
return nil, err
}
// Populate the dir structure
for _, p := range paths {
if err := idtools.MkdirAllAndChown(path.Join(root, p), 0700, idtools.IDPair{UID: rootUID, GID: rootGID}); err != nil {
@ -607,7 +603,7 @@ func (a *Driver) Cleanup() error {
logrus.Debugf("aufs error unmounting %s: %s", m, err)
}
}
return mountpk.Unmount(a.root)
return mountpk.RecursiveUnmount(a.root)
}
func (a *Driver) aufsMount(ro []string, rw, target, mountLabel string) (err error) {

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

@ -77,10 +77,6 @@ func Init(home string, options []string, uidMaps, gidMaps []idtools.IDMap) (grap
return nil, err
}
if err := mount.MakePrivate(home); err != nil {
return nil, err
}
opt, userDiskQuota, err := parseOptions(options)
if err != nil {
return nil, err
@ -167,7 +163,7 @@ func (d *Driver) Cleanup() error {
return err
}
return mount.Unmount(d.home)
return mount.RecursiveUnmount(d.home)
}
func free(p *C.char) {

6
daemon/graphdriver/devmapper/driver.go
View file

@ -42,10 +42,6 @@ func Init(home string, options []string, uidMaps, gidMaps []idtools.IDMap) (grap
return nil, err
}
if err := mount.MakePrivate(home); err != nil {
return nil, err
}
d := &Driver{
DeviceSet: deviceSet,
home: home,
@ -127,7 +123,7 @@ func (d *Driver) GetMetadata(id string) (map[string]string, error) {
func (d *Driver) Cleanup() error {
err := d.DeviceSet.Shutdown(d.home)
if err2 := mount.Unmount(d.home); err == nil {
if err2 := mount.RecursiveUnmount(d.home); err == nil {
err = err2
}

6
daemon/graphdriver/overlay/overlay.go
View file

@ -164,10 +164,6 @@ func Init(home string, options []string, uidMaps, gidMaps []idtools.IDMap) (grap
return nil, err
}
if err := mount.MakePrivate(home); err != nil {
return nil, err
}
d := &Driver{
home: home,
uidMaps: uidMaps,
@ -248,7 +244,7 @@ func (d *Driver) GetMetadata(id string) (map[string]string, error) {
// is being shutdown. For now, we just have to unmount the bind mounted
// we had created.
func (d *Driver) Cleanup() error {
return mount.Unmount(d.home)
return mount.RecursiveUnmount(d.home)
}
// CreateReadWrite creates a layer that is writable for use as a container

6
daemon/graphdriver/overlay2/overlay.go
View file

@ -201,10 +201,6 @@ func Init(home string, options []string, uidMaps, gidMaps []idtools.IDMap) (grap
return nil, err
}
if err := mount.MakePrivate(home); err != nil {
return nil, err
}
d := &Driver{
home: home,
uidMaps: uidMaps,
@ -335,7 +331,7 @@ func (d *Driver) GetMetadata(id string) (map[string]string, error) {
// is being shutdown. For now, we just have to unmount the bind mounted
// we had created.
func (d *Driver) Cleanup() error {
return mount.Unmount(d.home)
return mount.RecursiveUnmount(d.home)
}
// CreateReadWrite creates a layer that is writable for use as a container

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

@ -108,9 +108,6 @@ func Init(base string, opt []string, uidMaps, gidMaps []idtools.IDMap) (graphdri
return nil, fmt.Errorf("Failed to create '%s': %v", base, err)
}
if err := mount.MakePrivate(base); err != nil {
return nil, err
}
d := &Driver{
dataset: rootDataset,
options: options,
@ -181,10 +178,9 @@ func (d *Driver) String() string {
return "zfs"
}
// Cleanup is called on daemon shutdown. It unmounts the bind mount
// created by mount.MakePrivate() in Init().
// Cleanup is called on daemon shutdown, it is used to clean up any remaining mounts
func (d *Driver) Cleanup() error {
return mount.Unmount(d.options.mountPath)
return mount.RecursiveUnmount(d.options.mountPath)
}
// Status returns information about the ZFS filesystem. It returns a two dimensional array of information