Merge pull request #2785 from k8s-infra-cherrypick-robot/cherry-pick-…

…2783-to-release-1.30 [release-1.30] fix: get disk stuck issue
kubernetes-sigs · Jan 3, 2025 · 51d6388 · 51d6388
2 parents adbbe9b + 8bf42c4
commit 51d6388
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/pkg/azuredisk/azuredisk.go b/pkg/azuredisk/azuredisk.go
@@ -399,7 +399,12 @@ func (d *Driver) checkDiskExists(ctx context.Context, diskURI string) (*armcompu
 	if err != nil {
 		return nil, err
 	}
-	disk, err := diskClient.Get(ctx, resourceGroup, diskName)
+
+	// get disk operation should timeout within 1min if it takes too long time
+	newCtx, cancel := context.WithTimeout(ctx, time.Minute)
+	defer cancel()
+
+	disk, err := diskClient.Get(newCtx, resourceGroup, diskName)
 	if err != nil {
 		return nil, err
 	}

diff --git a/pkg/azuredisk/controllerserver_test.go b/pkg/azuredisk/controllerserver_test.go
@@ -724,7 +724,7 @@ func TestControllerModifyVolume(t *testing.T) {
 		}
 		diskClient := mock_diskclient.NewMockInterface(cntl)
 		d.getClientFactory().(*mock_azclient.MockClientFactory).EXPECT().GetDiskClientForSub(gomock.Any()).Return(diskClient, nil).AnyTimes()
-		diskClient.EXPECT().Get(gomock.Eq(ctx), gomock.Any(), gomock.Any()).Return(disk, nil).AnyTimes()
+		diskClient.EXPECT().Get(gomock.Any(), gomock.Any(), gomock.Any()).Return(disk, nil).AnyTimes()
 		diskClient.EXPECT().Patch(gomock.Eq(ctx), gomock.Any(), gomock.Any(), gomock.Any()).Return(disk, nil).AnyTimes()
 
 		result, err := d.ControllerModifyVolume(ctx, test.req)