Merge pull request #23435 from jsafrane/devel/fix-nsenter-mkdir

Automatic merge from submit-queue Fixed mounting with containerized kubelet `NsenterMounter.IsLikelyNotMountPoint()` should return `ErrNotExist` when the checked directory does not exists - the regular mounted does this and some volume plugins depend on this behavior. See for example: https://github.com/kubernetes/kubernetes/blob/master/pkg/volume/aws_ebs/aws_util.go#L72

Merge pull request #23435 from jsafrane/devel/fix-nsenter-mkdir
ae576441 · k8s-merge-robot · 8eb19c78 · 92f18117 · ae576441 · ae576441
Commit ae576441 authored Apr 13, 2016 by k8s-merge-robot
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 0 deletions

mount.go pkg/util/mount/mount.go +1 -0

nsenter_mount.go pkg/util/mount/nsenter_mount.go +6 -0

No files found.
--- a/pkg/util/mount/mount.go
+++ b/pkg/util/mount/mount.go
@@ -34,6 +34,7 @@ type Interface interface {
 	// consistent.
 	List() ([]MountPoint, error)
 	// IsLikelyNotMountPoint determines if a directory is a mountpoint.
+	// It should return ErrNotExist when the directory does not exist.
 	IsLikelyNotMountPoint(file string) (bool, error)
 }

--- a/pkg/util/mount/nsenter_mount.go
+++ b/pkg/util/mount/nsenter_mount.go
@@ -170,6 +170,12 @@ func (n *NsenterMounter) IsLikelyNotMountPoint(file string) (bool, error) {
 		return true, err
 	}
+	// Check the directory exists
+	if _, err = os.Stat(file); os.IsNotExist(err) {
+		glog.V(5).Infof("findmnt: directory %s does not exist", file)
+		return true, err
+	}
 	args := []string{"--mount=/rootfs/proc/1/ns/mnt", "--", n.absHostPath("findmnt"), "-o", "target", "--noheadings", "--target", file}
 	glog.V(5).Infof("findmnt command: %v %v", nsenterPath, args)