GitList

Browse code

Use lazy unmount for local volume unmount

This is a spiritual backport of acbfe6bc56b9357d40a452f6b3901cb2c2d40404
The afformentioned commit was not cherry-picked because it is a broader
change to the codebase, whereas this is the same basic fix but localized
to the local volume driver.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>

Brian Goff authored on 2017/05/10 03:17:10
Showing 4 changed files

volume/local/local.go index cdda210..56fccb0 100644
volume/local/unmount_linux.go index 0000000..e825e4d
volume/local/unmount_unix.go index 0000000..c1c2c16
volume/local/unmount_windows.go index 0000000..42b38fa

volume/local/local.go

History View file @ 2dfb31c

@@ -353,7 +353,7 @@ func (v *localVolume) Unmount(id string) error {
                      func (v *localVolume) unmount() error {
                      	if v.opts != nil {
                     -		if err := mount.Unmount(v.path); err != nil {
                     +		if err := unmount(v.path); err != nil {
                      			if mounted, mErr := mount.Mounted(v.path); mounted || mErr != nil {
                      				return errors.Wrapf(err, "error while unmounting volume path '%s'", v.path)
+                     			}

volume/local/unmount_linux.go

History View file @ 2dfb31c

                     new file mode 100644
@@ -0,0 +1,7 @@
                     +package local
+                    +
                     +import "golang.org/x/sys/unix"
+                    +
                     +func unmount(path string) error {
                     +	return unix.Unmount(path, unix.MNT_DETACH)
                     +}

volume/local/unmount_unix.go

History View file @ 2dfb31c

                     new file mode 100644
@@ -0,0 +1,9 @@
                     +// +build !linux,!windows
+                    +
                     +package local
+                    +
                     +import "golang.org/x/sys/unix"
+                    +
                     +func unmount(path string) error {
                     +	return unix.Unmount(path, 0)
                     +}

volume/local/unmount_windows.go

History View file @ 2dfb31c

                     new file mode 100644
@@ -0,0 +1,5 @@
                     +package local
+                    +
                     +func unmount(_ string) error {
                     +	return nil
                     +}