Merge pull request #2289 from k8s-infra-cherrypick-robot/cherry-pick-2288-to-release-1.27

[release-1.27] chore: increase blobfuse mount timeout

Author: k8s-ci-robot

pkg/blob/blob.go

@@ -182,7 +182,7 @@ type DriverOptions struct {
 	DriverName                             string
 	BlobfuseProxyEndpoint                  string
 	EnableBlobfuseProxy                    bool
-	BlobfuseProxyConnTimout                int
+	BlobfuseProxyConnTimeout               int
 	EnableBlobMockMount                    bool
 	AllowInlineVolumeKeyAccessWithIdentity bool
 	EnableGetVolumeStats                   bool
@@ -202,7 +202,7 @@ func (option *DriverOptions) AddFlags() {
 	flag.StringVar(&option.NodeID, "nodeid", "", "node id")
 	flag.StringVar(&option.DriverName, "drivername", DefaultDriverName, "name of the driver")
 	flag.BoolVar(&option.EnableBlobfuseProxy, "enable-blobfuse-proxy", false, "using blobfuse proxy for mounts")
-	flag.IntVar(&option.BlobfuseProxyConnTimout, "blobfuse-proxy-connect-timeout", 5, "blobfuse proxy connection timeout(seconds)")
+	flag.IntVar(&option.BlobfuseProxyConnTimeout, "blobfuse-proxy-connect-timeout", 5, "blobfuse proxy connection timeout(seconds)")
 	flag.BoolVar(&option.EnableBlobMockMount, "enable-blob-mock-mount", false, "enable mock mount(only for testing)")
 	flag.BoolVar(&option.EnableGetVolumeStats, "enable-get-volume-stats", false, "allow GET_VOLUME_STATS on agent node")
 	flag.BoolVar(&option.AppendTimeStampInCacheDir, "append-timestamp-cache-dir", false, "append timestamp into cache directory on agent node")
@@ -238,7 +238,7 @@ type Driver struct {
 	allowInlineVolumeKeyAccessWithIdentity bool
 	appendTimeStampInCacheDir              bool
 	appendMountErrorHelpLink               bool
-	blobfuseProxyConnTimout                int
+	blobfuseProxyConnTimeout               int
 	mountPermissions                       uint64
 	enableAznfsMount                       bool
 	enableVolumeMountGroup                 bool
@@ -283,7 +283,7 @@ func NewDriver(options *DriverOptions, kubeClient kubernetes.Interface, cloud *s
 		blobfuseProxyEndpoint:                  options.BlobfuseProxyEndpoint,
 		enableBlobfuseProxy:                    options.EnableBlobfuseProxy,
 		allowInlineVolumeKeyAccessWithIdentity: options.AllowInlineVolumeKeyAccessWithIdentity,
-		blobfuseProxyConnTimout:                options.BlobfuseProxyConnTimout,
+		blobfuseProxyConnTimeout:               options.BlobfuseProxyConnTimeout,
 		enableBlobMockMount:                    options.EnableBlobMockMount,
 		enableGetVolumeStats:                   options.EnableGetVolumeStats,
 		enableVolumeMountGroup:                 options.EnableVolumeMountGroup,

pkg/blob/blob_test.go

@@ -57,7 +57,7 @@ func NewFakeDriver() *Driver {
 		DriverName:                  DefaultDriverName,
 		BlobfuseProxyEndpoint:       "",
 		EnableBlobfuseProxy:         false,
-		BlobfuseProxyConnTimout:     5,
+		BlobfuseProxyConnTimeout:    5,
 		WaitForAzCopyTimeoutMinutes: 1,
 		EnableBlobMockMount:         false,
 	}
@@ -70,12 +70,12 @@ func NewFakeDriver() *Driver {
 
 func TestNewFakeDriver(t *testing.T) {
 	driverOptions := DriverOptions{
-		NodeID:                  fakeNodeID,
-		DriverName:              DefaultDriverName,
-		BlobfuseProxyEndpoint:   "",
-		EnableBlobfuseProxy:     false,
-		BlobfuseProxyConnTimout: 5,
-		EnableBlobMockMount:     false,
+		NodeID:                   fakeNodeID,
+		DriverName:               DefaultDriverName,
+		BlobfuseProxyEndpoint:    "",
+		EnableBlobfuseProxy:      false,
+		BlobfuseProxyConnTimeout: 5,
+		EnableBlobMockMount:      false,
 	}
 	d := NewDriver(&driverOptions, nil, &storage.AccountRepo{})
 	assert.NotNil(t, d)
@@ -87,7 +87,7 @@ func TestNewDriver(t *testing.T) {
 		DriverName:                  DefaultDriverName,
 		BlobfuseProxyEndpoint:       "",
 		EnableBlobfuseProxy:         false,
-		BlobfuseProxyConnTimout:     5,
+		BlobfuseProxyConnTimeout:    5,
 		WaitForAzCopyTimeoutMinutes: 1,
 		EnableBlobMockMount:         false,
 	}

pkg/blob/nodeserver.go

@@ -47,7 +47,7 @@ import (
 
 const (
 	waitForMountInterval = 20 * time.Millisecond
-	waitForMountTimeout  = 60 * time.Second
+	waitForMountTimeout  = 110 * time.Second
 )
 
 type MountClient struct {
@@ -158,10 +158,8 @@ func (d *Driver) NodePublishVolume(ctx context.Context, req *csi.NodePublishVolu
 }
 
 func (d *Driver) mountBlobfuseWithProxy(args, protocol string, authEnv []string) (string, error) {
-	var resp *mount_azure_blob.MountAzureBlobResponse
-	var output string
-	connectionTimout := time.Duration(d.blobfuseProxyConnTimout) * time.Second
-	ctx, cancel := context.WithTimeout(context.Background(), connectionTimout)
+	connectionTimeout := time.Duration(d.blobfuseProxyConnTimeout) * time.Second
+	ctx, cancel := context.WithTimeout(context.Background(), connectionTimeout)
 	defer cancel()
 	klog.V(2).Infof("start connecting to blobfuse proxy, protocol: %s, args: %s", protocol, args)
 	conn, err := grpc.DialContext(ctx, d.blobfuseProxyEndpoint, grpc.WithInsecure(), grpc.WithBlock())
@@ -182,12 +180,15 @@ func (d *Driver) mountBlobfuseWithProxy(args, protocol string, authEnv []string)
 		AuthEnv:   authEnv,
 	}
 	klog.V(2).Infof("begin to mount with blobfuse proxy, protocol: %s, args: %s", protocol, args)
-	resp, err = mountClient.service.MountAzureBlob(context.TODO(), &mountreq)
+	resp, err := mountClient.service.MountAzureBlob(context.TODO(), &mountreq)
 	if err != nil {
 		klog.Error("GRPC call returned with an error:", err)
 	}
-	output = resp.GetOutput()
-
+	var output string
+	if resp != nil {
+		output = resp.GetOutput()
+	}
+	klog.V(2).Infof("mount with blobfuse proxy completed, protocol: %s, args: %s, output: %s, error: %v", protocol, args, output, err)
 	return output, err
 }
 

pkg/blob/nodeserver_test.go

@@ -996,7 +996,7 @@ func TestMountBlobfuseWithProxy(t *testing.T) {
 				// Create the driver with the configured proxy
 				d := NewFakeDriver()
 				d.blobfuseProxyEndpoint = lis.Addr().String()
-				d.blobfuseProxyConnTimout = 5 // 5 second timeout
+				d.blobfuseProxyConnTimeout = 5 // 5 second timeout
 
 				return d, s, lis
 			},
@@ -1037,7 +1037,7 @@ func TestMountBlobfuseWithProxy(t *testing.T) {
 				// Create the driver with the configured proxy
 				d := NewFakeDriver()
 				d.blobfuseProxyEndpoint = lis.Addr().String()
-				d.blobfuseProxyConnTimout = 5 // 5 second timeout
+				d.blobfuseProxyConnTimeout = 5 // 5 second timeout
 
 				return d, s, lis
 			},
@@ -1057,7 +1057,7 @@ func TestMountBlobfuseWithProxy(t *testing.T) {
 				// Create the driver with a non-existent endpoint
 				d := NewFakeDriver()
 				d.blobfuseProxyEndpoint = "unix://non-existent-socket.sock"
-				d.blobfuseProxyConnTimout = 1 // 1 second timeout for quick failure
+				d.blobfuseProxyConnTimeout = 1 // 1 second timeout for quick failure
 
 				// No server or listener for this test
 				return d, nil, nil

test/e2e/suite_test.go

@@ -122,12 +122,12 @@ var _ = ginkgo.SynchronizedBeforeSuite(func(ctx ginkgo.SpecContext) []byte {
 	_, useBlobfuseProxy := os.LookupEnv("ENABLE_BLOBFUSE_PROXY")
 	os.Setenv("AZURE_CREDENTIAL_FILE", credentials.TempAzureCredentialFilePath)
 	driverOptions := blob.DriverOptions{
-		NodeID:                  os.Getenv("nodeid"),
-		DriverName:              blob.DefaultDriverName,
-		BlobfuseProxyEndpoint:   "",
-		EnableBlobfuseProxy:     useBlobfuseProxy,
-		BlobfuseProxyConnTimout: 5,
-		EnableBlobMockMount:     false,
+		NodeID:                   os.Getenv("nodeid"),
+		DriverName:               blob.DefaultDriverName,
+		BlobfuseProxyEndpoint:    "",
+		EnableBlobfuseProxy:      useBlobfuseProxy,
+		BlobfuseProxyConnTimeout: 5,
+		EnableBlobMockMount:      false,
 	}
 	kubeClient, err := util.GetKubeClient(kubeconfig, 25.0, 50, "")
 	gomega.Expect(err).NotTo(gomega.HaveOccurred())