github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #27054 from jingxu97/bug-volume

Browse Source 
Automatic merge from submit-queue

Fix bug in isLikelyNotMountPoint function

In nsenter_mount.go/isLikelyNotMountPoint function, the returned output
from findmnt command misses the last letter. Modify the code to use
String.contains instead of string matching. fixes #26421 fixes #25056 fixes #22911
This commit is contained in:
k8s-merge-robot
2016-06-18 17:08:02 -07:00
committed by GitHub
parent 637734f003 809dae1978
commit 6b14e0f226
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
pkg/util/mount/nsenter_mount.go
View File

@@ -175,8 +175,11 @@ func (n *NsenterMounter) IsLikelyNotMountPoint(file string) (bool, error) {
glog.V(5).Infof("findmnt: directory %s does not exist", file) glog.V(5).Infof("findmnt: directory %s does not exist", file)
return true, err return true, err
} }
// Add --first-only option: since we are testing for the absense of a mountpoint, it is sufficient to get only
args := []string{"--mount=/rootfs/proc/1/ns/mnt", "--", n.absHostPath("findmnt"), "-o", "target", "--noheadings", "--target", file} // the first of multiple possible mountpoints using --first-only.
// Also add fstype output to make sure that the output of target file will give the full path
// TODO: Need more refactoring for this function. Track the solution with issue #26996
args := []string{"--mount=/rootfs/proc/1/ns/mnt", "--", n.absHostPath("findmnt"), "-o", "target,fstype", "--noheadings", "--first-only", "--target", file}
glog.V(5).Infof("findmnt command: %v %v", nsenterPath, args) glog.V(5).Infof("findmnt command: %v %v", nsenterPath, args)
exec := exec.New() exec := exec.New()
@@ -188,13 +191,15 @@ func (n *NsenterMounter) IsLikelyNotMountPoint(file string) (bool, error) {
// It's safer to assume that it's not a mount point. // It's safer to assume that it's not a mount point.
return true, nil return true, nil
} }
strOut := strings.TrimSuffix(string(out), "\n") mountTarget := strings.Split(string(out), " ")[0]
mountTarget = strings.TrimSuffix(mountTarget, "\n")
glog.V(5).Infof("IsLikelyNotMountPoint findmnt output for path %s: %v:", file, mountTarget)
glog.V(5).Infof("IsLikelyNotMountPoint findmnt output for path %s: %v", file, strOut) if mountTarget == file {
if strOut == file { glog.V(5).Infof("IsLikelyNotMountPoint: %s is a mount point", file)
return false, nil return false, nil
} }
glog.V(5).Infof("IsLikelyNotMountPoint: %s is not a mount point", file)
return true, nil return true, nil
} }