fix: deal with unsupported mounter

Author: AlbeeSo

pkg/mounter/cmd_mounter.go

@@ -8,7 +8,6 @@ import (
 	"path/filepath"
 	"time"
 
-	"github.com/kubernetes-sigs/alibaba-cloud-csi-driver/pkg/mounter/utils"
 	"k8s.io/klog/v2"
 	"k8s.io/mount-utils"
 )
@@ -57,12 +56,6 @@ func (m *OssCmdMounter) MountWithSecrets(source, target, fstype string, options
 	}
 	return nil
 }
-func saveOssSecretsToFileIfNeeded(authCfg *utils.AuthConfig) (string, error) {
-	if authCfg == nil || authCfg.Secrets == nil {
-		return "", nil
-	}
-	return saveOssSecretsToFile(authCfg.Secrets)
-}
 
 func saveOssSecretsToFile(secrets map[string]string) (filePath string, err error) {
 	passwd := secrets["passwd-ossfs"]

pkg/mounter/mounter.go

@@ -2,6 +2,7 @@ package mounter
 
 import (
 	"fmt"
+	"strings"
 
 	mountutils "k8s.io/mount-utils"
 )
@@ -16,3 +17,10 @@ type Mounter interface {
 func ErrNotImplemented(driver, mounterType, method string) error {
 	return fmt.Errorf("%s(%s): %s not implemented", mounterType, driver, method)
 }
+
+func IsNotImplementedErr(err error) bool {
+	if err == nil {
+		return false
+	}
+	return strings.Contains(err.Error(), "not implemented")
+}

pkg/oss/nodeserver.go

@@ -109,6 +109,7 @@ func (ns *nodeServer) NodePublishVolume(ctx context.Context, req *csi.NodePublis
 	if err := validateNodePublishVolumeRequest(req); err != nil {
 		return nil, err
 	}
+	attachPath := mounterutils.GetAttachPath(req.VolumeId)
 
 	// parse options
 	// ensure fuseType is not empty
@@ -176,11 +177,21 @@ func (ns *nodeServer) NodePublishVolume(ctx context.Context, req *csi.NodePublis
 	}
 	if !notMnt {
 		klog.Infof("NodePublishVolume: %s already mounted", targetPath)
-		if needRotateToken(opts, authCfg.Secrets) {
-			err := ossfsMounter.RotateToken(targetPath, opts.FuseType, authCfg.Secrets)
+		if !features.FunctionalMutableFeatureGate.Enabled(features.RundCSIProtocol3) && needRotateToken(opts, authCfg.Secrets) {
+			// mountPath is the target path for mounter
+			mountPath := attachPath
+			if ns.skipAttach {
+				mountPath = targetPath
+			}
+			err := ossfsMounter.RotateToken(mountPath, opts.FuseType, authCfg.Secrets)
 			if err != nil {
+				// if is mounter not supported, return unimplentederror to avoid retry
+				if mounter.IsNotImplementedErr(err) {
+					return nil, status.Error(codes.Unimplemented, err.Error())
+				}
 				return nil, status.Error(codes.Internal, err.Error())
 			}
+			klog.Infof("NodePublishVolume: %s already rotated token", targetPath)
 		}
 		return &csi.NodePublishVolumeResponse{}, nil
 	}
@@ -200,7 +211,6 @@ func (ns *nodeServer) NodePublishVolume(ctx context.Context, req *csi.NodePublis
 
 	// When work as csi nodeserver, mount on the attach path under /run/fuse.ossfs and then perform the bind mount.
 	// check whether the attach path is mounted
-	attachPath := mounterutils.GetAttachPath(req.VolumeId)
 	notMnt, err = isNotMountPoint(ns.rawMounter, attachPath)
 	if err != nil {
 		return nil, err