Skip to content

Commit 77afa25

Browse files
authored
timeout fixes (#3578)
1 parent 2176e81 commit 77afa25

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

tests/e2e/csi_snapshot_utils.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ func deleteVolumeSnapshotContentWithPandoraWait(ctx context.Context, snapc *snap
184184
func waitForVolumeSnapshotContentToBeDeletedWithPandoraWait(ctx context.Context, snapc *snapclient.Clientset,
185185
name string, pandoraSyncWaitTime int) error {
186186
var err error
187-
waitErr := wait.PollUntilContextTimeout(ctx, poll, 2*pollTimeout, true,
187+
waitErr := wait.PollUntilContextTimeout(ctx, poll, vscDeleteTimeout, true,
188188
func(ctx context.Context) (bool, error) {
189189
_, err = snapc.SnapshotV1().VolumeSnapshotContents().Get(ctx, name, metav1.GetOptions{})
190190
if err != nil {

tests/e2e/e2e_common.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ const (
179179
regionKey = "topology.csi.vmware.com/k8s-region"
180180
resizePollInterval = 2 * time.Second
181181
restartOperation = "restart"
182-
rqLimit = "200Gi"
182+
rqLimit = "500Gi"
183183
rqLimitScaleTest = "900Gi"
184184
rootUser = "root"
185185
defaultrqLimit = "20Gi"
@@ -275,6 +275,8 @@ const (
275275
devopsKubeConf = "DEV_OPS_USER_KUBECONFIG"
276276
quotaSupportedVCVersion = "9.0.0"
277277
lateBinding = "-latebinding"
278+
cnsVolumeDeleteTimeout = 5 * time.Minute
279+
vscDeleteTimeout = 5 * time.Minute
278280
)
279281

280282
/*

tests/e2e/vsphere.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -467,7 +467,7 @@ func (vs *vSphere) waitForMetadataToBeDeleted(volumeID string, entityType string
467467
// waitForCNSVolumeToBeDeleted executes QueryVolume API on vCenter and verifies
468468
// volume entries are deleted from vCenter Database
469469
func (vs *vSphere) waitForCNSVolumeToBeDeleted(volumeID string) error {
470-
err := wait.PollUntilContextTimeout(context.Background(), poll, 2*pollTimeout, true,
470+
err := wait.PollUntilContextTimeout(context.Background(), poll, cnsVolumeDeleteTimeout, true,
471471
func(ctx context.Context) (bool, error) {
472472
queryResult, err := vs.queryCNSVolumeWithResult(volumeID)
473473
if err != nil {

0 commit comments

Comments
 (0)