Merge pull request #840 from andyzhangx/fix-dup-mount

andyzhangx · web-flow · commit 1616c4e170be · 2025-01-12T20:18:02.000+08:00
fix: duplicated nfs mount
diff --git a/pkg/nfs/nodeserver.go b/pkg/nfs/nodeserver.go
@@ -136,10 +136,6 @@ func (ns *NodeServer) NodePublishVolume(_ context.Context, req *csi.NodePublishV
 	}
 	timeoutFunc := func() error { return fmt.Errorf("time out") }
 	if err := WaitUntilTimeout(90*time.Second, execFunc, timeoutFunc); err != nil {
-		return nil, status.Error(codes.Internal, fmt.Sprintf("volume(%s) mount %q on %q failed with %v", volumeID, source, targetPath, err))
-	}
-	err = ns.mounter.Mount(source, targetPath, "nfs", mountOptions)
-	if err != nil {
 		if os.IsPermission(err) {
 			return nil, status.Error(codes.PermissionDenied, err.Error())
 		}

Original file line number	Diff line number	Diff line change
`@@ -136,10 +136,6 @@ func (ns NodeServer) NodePublishVolume(_ context.Context, req csi.NodePublishV`
`136`	`136`	`}`
`137`	`137`	`timeoutFunc := func() error { return fmt.Errorf("time out") }`
`138`	`138`	`if err := WaitUntilTimeout(90*time.Second, execFunc, timeoutFunc); err != nil {`
`139`		`- return nil, status.Error(codes.Internal, fmt.Sprintf("volume(%s) mount %q on %q failed with %v", volumeID, source, targetPath, err))`
`140`		`- }`
`141`		`- err = ns.mounter.Mount(source, targetPath, "nfs", mountOptions)`
`142`		`- if err != nil {`
`143`	`139`	`if os.IsPermission(err) {`
`144`	`140`	`return nil, status.Error(codes.PermissionDenied, err.Error())`
`145`	`141`	`}`