Merge pull request #569 from andyzhangx/force-umount

fix: use force unmount to fix umount failure

Author: andyzhangx

go.mod

@@ -473,7 +473,7 @@ replace (
 	k8s.io/kubelet => k8s.io/kubelet v0.26.0
 	k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.26.0
 	k8s.io/metrics => k8s.io/metrics v0.26.0
-	k8s.io/mount-utils => k8s.io/mount-utils v0.0.0-20221216112627-49433b159e95
+	k8s.io/mount-utils => k8s.io/mount-utils v0.0.0-20230103133730-1df1a57439e2
 	k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.26.0
 	k8s.io/repo-infra => k8s.io/repo-infra v0.0.1-alpha.1
 	k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.26.0

go.sum

@@ -448,8 +448,8 @@ k8s.io/kubectl v0.26.0 h1:xmrzoKR9CyNdzxBmXV7jW9Ln8WMrwRK6hGbbf69o4T0=
 k8s.io/kubectl v0.26.0/go.mod h1:eInP0b+U9XUJWSYeU9XZnTA+cVYuWyl3iYPGtru0qhQ=
 k8s.io/kubernetes v1.26.0 h1:fL8VMr4xlfTazPORLhz5fsvO5I3bsFpmynVxZTH1ItQ=
 k8s.io/kubernetes v1.26.0/go.mod h1:z0aCJwn6DxzB/dDiWLbQaJO5jWOR2qoaCMnmSAx45XM=
-k8s.io/mount-utils v0.0.0-20221216112627-49433b159e95 h1:dnn7wb0OaHJNhfsNm266QD0XTUdFZ2so93bfJZpEeUA=
-k8s.io/mount-utils v0.0.0-20221216112627-49433b159e95/go.mod h1:au99w4FWU5ZWelLb3Yx6kJc8RZ387IyWVM9tN65Yhxo=
+k8s.io/mount-utils v0.0.0-20230103133730-1df1a57439e2 h1:kfACKquxtsEA7XXDy+iC92lg/1stK0UtzAhf7R2Y8Fc=
+k8s.io/mount-utils v0.0.0-20230103133730-1df1a57439e2/go.mod h1:au99w4FWU5ZWelLb3Yx6kJc8RZ387IyWVM9tN65Yhxo=
 k8s.io/pod-security-admission v0.26.0 h1:XBG/uyP2cYwSFr5IWAQ1IIArxMYARJKzEzSmP4ZbC1s=
 k8s.io/pod-security-admission v0.26.0/go.mod h1:HQHvpCrn6KQLKRUqFvWkHCVKet3X62fn2F3j5anYiEM=
 k8s.io/utils v0.0.0-20210802155522-efc7438f0176/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=

pkg/mounter/safe_mounter_unix.go

@@ -20,13 +20,20 @@ limitations under the License.
 package mounter
 
 import (
+	"runtime"
+
 	mount "k8s.io/mount-utils"
 	utilexec "k8s.io/utils/exec"
 )
 
 func NewSafeMounter(removeSMBMappingDuringUnmount bool) (*mount.SafeFormatAndMount, error) {
+	mounter := mount.New("")
+	if runtime.GOOS == "linux" {
+		// MounterForceUnmounter is only implemented on Linux now
+		mounter = mounter.(mount.MounterForceUnmounter)
+	}
 	return &mount.SafeFormatAndMount{
-		Interface: mount.New(""),
+		Interface: mounter,
 		Exec:      utilexec.New(),
 	}, nil
 }

pkg/smb/smb_common_linux.go

@@ -20,8 +20,13 @@ limitations under the License.
 package smb
 
 import (
+	"fmt"
 	"os"
+	"os/exec"
+	"strings"
+	"time"
 
+	"k8s.io/klog/v2"
 	mount "k8s.io/mount-utils"
 )
 
@@ -34,7 +39,21 @@ func CleanupSMBMountPoint(m *mount.SafeFormatAndMount, target string, extensiveM
 }
 
 func CleanupMountPoint(m *mount.SafeFormatAndMount, target string, extensiveMountCheck bool) error {
-	return mount.CleanupMountPoint(target, m, extensiveMountCheck)
+	var err error
+	extensiveMountPointCheck := true
+	forceUnmounter, ok := m.Interface.(mount.MounterForceUnmounter)
+	if ok {
+		klog.V(2).Infof("force unmount on %s", target)
+		err = mount.CleanupMountWithForce(target, forceUnmounter, extensiveMountPointCheck, 30*time.Second)
+	} else {
+		err = mount.CleanupMountPoint(target, m.Interface, extensiveMountPointCheck)
+	}
+
+	if err != nil && strings.Contains(err.Error(), "target is busy") {
+		klog.Warningf("unmount on %s failed with %v, try lazy unmount", target, err)
+		err = forceUmount(target)
+	}
+	return err
 }
 
 func preparePublishPath(path string, m *mount.SafeFormatAndMount) error {
@@ -48,3 +67,12 @@ func prepareStagePath(path string, m *mount.SafeFormatAndMount) error {
 func Mkdir(m *mount.SafeFormatAndMount, name string, perm os.FileMode) error {
 	return os.Mkdir(name, perm)
 }
+
+func forceUmount(path string) error {
+	cmd := exec.Command("umount", "-lf", path)
+	out, cmderr := cmd.CombinedOutput()
+	if cmderr != nil {
+		return fmt.Errorf("lazy unmount on %s failed with %v, output: %s", path, cmderr, string(out))
+	}
+	return nil
+}

vendor/k8s.io/mount-utils/mount_linux.go

@@ -1038,7 +1038,7 @@ k8s.io/kubernetes/test/e2e/testing-manifests
 k8s.io/kubernetes/test/utils
 k8s.io/kubernetes/test/utils/image
 k8s.io/kubernetes/test/utils/kubeconfig
-# k8s.io/mount-utils v0.26.0 => k8s.io/mount-utils v0.0.0-20221216112627-49433b159e95
+# k8s.io/mount-utils v0.26.0 => k8s.io/mount-utils v0.0.0-20230103133730-1df1a57439e2
 ## explicit; go 1.19
 k8s.io/mount-utils
 # k8s.io/pod-security-admission v0.0.0 => k8s.io/pod-security-admission v0.26.0
@@ -1438,7 +1438,7 @@ sigs.k8s.io/yaml
 # k8s.io/kubelet => k8s.io/kubelet v0.26.0
 # k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.26.0
 # k8s.io/metrics => k8s.io/metrics v0.26.0
-# k8s.io/mount-utils => k8s.io/mount-utils v0.0.0-20221216112627-49433b159e95
+# k8s.io/mount-utils => k8s.io/mount-utils v0.0.0-20230103133730-1df1a57439e2
 # k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.26.0
 # k8s.io/repo-infra => k8s.io/repo-infra v0.0.1-alpha.1
 # k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.26.0