Merge pull request #2199 from k8s-infra-cherrypick-robot/cherry-pick-2197-to-release-1.31

andyzhangx · web-flow · commit 3f7907cb5800 · 2024-11-15T09:58:18.000+08:00
[release-1.31] fix: change mount timeout to 1.5min
diff --git a/pkg/azurefile/nodeserver.go b/pkg/azurefile/nodeserver.go
@@ -405,7 +405,7 @@ func (d *Driver) NodeStageVolume(ctx context.Context, req *csi.NodeStageVolumeRe
 			return SMBMount(d.mounter, source, cifsMountPath, mountFsType, mountOptions, sensitiveMountOptions)
 		}
 		timeoutFunc := func() error { return fmt.Errorf("time out") }
-		if err := volumehelper.WaitUntilTimeout(2*time.Minute, execFunc, timeoutFunc); err != nil {
+		if err := volumehelper.WaitUntilTimeout(90*time.Second, execFunc, timeoutFunc); err != nil {
 			var helpLinkMsg string
 			if d.appendMountErrorHelpLink {
 				helpLinkMsg = "\nPlease refer to http://aka.ms/filemounterror for possible causes and solutions for mount errors."

Original file line number	Diff line number	Diff line change
`@@ -405,7 +405,7 @@ func (d Driver) NodeStageVolume(ctx context.Context, req csi.NodeStageVolumeRe`
`405`	`405`	`return SMBMount(d.mounter, source, cifsMountPath, mountFsType, mountOptions, sensitiveMountOptions)`
`406`	`406`	`}`
`407`	`407`	`timeoutFunc := func() error { return fmt.Errorf("time out") }`
`408`		`- if err := volumehelper.WaitUntilTimeout(2*time.Minute, execFunc, timeoutFunc); err != nil {`
	`408`	`+ if err := volumehelper.WaitUntilTimeout(90*time.Second, execFunc, timeoutFunc); err != nil {`
`409`	`409`	`var helpLinkMsg string`
`410`	`410`	`if d.appendMountErrorHelpLink {`
`411`	`411`	`helpLinkMsg = "\nPlease refer to http://aka.ms/filemounterror for possible causes and solutions for mount errors."`