github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-07 03:03:59 +00:00
Code Issues Projects Releases Wiki Activity

Logging, remove LookPath in detectSafeNotMountedBehavior

Browse Source
This commit is contained in:
Carter McKinnon 2022-06-15 17:01:29 +00:00
parent efc7df4afe
commit 23c0e935b8
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
staging/src/k8s.io/mount-utils/mount_linux.go
View File

@ -238,14 +238,10 @@ func detectSafeNotMountedBehavior() bool {
// detectSafeNotMountedBehaviorWithExec is for testing with FakeExec. // detectSafeNotMountedBehaviorWithExec is for testing with FakeExec.
func detectSafeNotMountedBehaviorWithExec(exec utilexec.Interface) bool { func detectSafeNotMountedBehaviorWithExec(exec utilexec.Interface) bool {
if _, err := exec.LookPath("umount"); err != nil {
klog.V(2).Infof("Failed to locate umount executable to detect safe 'not mounted' behavior")
return false
}
// create a temp dir and try to umount it // create a temp dir and try to umount it
path, err := ioutil.TempDir("", "kubelet-detect-safe-umount") path, err := ioutil.TempDir("", "kubelet-detect-safe-umount")
if err != nil { if err != nil {
klog.V(2).Infof("Cannot create temp dir to detect safe 'not mounted' behavior: %v", err) klog.V(4).Infof("Cannot create temp dir to detect safe 'not mounted' behavior: %v", err)
return false return false
} }
defer os.RemoveAll(path) defer os.RemoveAll(path)
@ -253,12 +249,12 @@ func detectSafeNotMountedBehaviorWithExec(exec utilexec.Interface) bool {
output, err := cmd.CombinedOutput() output, err := cmd.CombinedOutput()
if err != nil { if err != nil {
if strings.Contains(string(output), errNotMounted) { if strings.Contains(string(output), errNotMounted) {
klog.V(2).Infof("Detected umount with safe 'not mounted' behavior") klog.V(4).Infof("Detected umount with safe 'not mounted' behavior")
return true return true
} }
klog.V(4).Infof("'umount %s' failed with: %v, output: %s", path, err, string(output)) klog.V(4).Infof("'umount %s' failed with: %v, output: %s", path, err, string(output))
} }
klog.V(2).Infof("Detected umount with unsafe 'not mounted' behavior") klog.V(4).Infof("Detected umount with unsafe 'not mounted' behavior")
return false return false
} }
@ -329,6 +325,7 @@ func AddSystemdScopeSensitive(systemdRunPath, mountName, command string, args []
} }
// Unmount unmounts the target. // Unmount unmounts the target.
// If the mounter has safe "not mounted" behavior, no error will be returned when the target is not a mount point.
func (mounter *Mounter) Unmount(target string) error { func (mounter *Mounter) Unmount(target string) error {
klog.V(4).Infof("Unmounting %s", target) klog.V(4).Infof("Unmounting %s", target)
command := exec.Command("umount", target) command := exec.Command("umount", target)
@ -343,6 +340,7 @@ func (mounter *Mounter) Unmount(target string) error {
err = &exec.ExitError{ProcessState: command.ProcessState} err = &exec.ExitError{ProcessState: command.ProcessState}
} }
if mounter.withSafeNotMountedBehavior && strings.Contains(string(output), errNotMounted) { if mounter.withSafeNotMountedBehavior && strings.Contains(string(output), errNotMounted) {
klog.V(4).Infof("ignoring 'not mounted' error for %s", target)
return nil return nil
} }
return fmt.Errorf("unmount failed: %v\nUnmounting arguments: %s\nOutput: %s", err, target, string(output)) return fmt.Errorf("unmount failed: %v\nUnmounting arguments: %s\nOutput: %s", err, target, string(output))