Merge pull request #277 from andyzhangx/unmount-stuck

fix: unmount stuck issue when smb file share is not found

Author: andyzhangx

pkg/smb/nodeserver.go

@@ -127,7 +127,7 @@ func (d *Driver) NodeUnpublishVolume(ctx context.Context, req *csi.NodeUnpublish
 	}
 
 	klog.V(2).Infof("NodeUnpublishVolume: unmounting volume %s on %s", volumeID, targetPath)
-	err := CleanupMountPoint(d.mounter, targetPath, false)
+	err := CleanupSMBMountPoint(d.mounter, targetPath, false)
 	if err != nil {
 		return nil, status.Errorf(codes.Internal, "failed to unmount target %q: %v", targetPath, err)
 	}

pkg/smb/smb_common_linux.go

@@ -37,6 +37,9 @@ func RemoveStageTarget(m *mount.SafeFormatAndMount, target string) error {
 }
 
 func CleanupSMBMountPoint(m *mount.SafeFormatAndMount, target string, extensiveMountCheck bool) error {
+	// unmount first since if remote SMB directory is not found, linked path cannot be deleted with CleanupMountPoint
+	// https://github.com/kubernetes/kubernetes/issues/97031
+	_ = m.Unmount(target)
 	return mount.CleanupMountPoint(target, m, extensiveMountCheck)
 }