Skip to content

Commit

Permalink
kvserver: deflake TestStoreRangeMergeConcurrentRequests
Browse files Browse the repository at this point in the history
Fixes: #136774

Release note: None
  • Loading branch information
iskettaneh committed Dec 6, 2024
1 parent 01fe74f commit 5ebd0b3
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions pkg/kv/kvserver/client_merge_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -2331,9 +2331,10 @@ func TestStoreRangeMergeConcurrentRequests(t *testing.T) {
}
}

// Failures in this test often present as a deadlock. Set a short timeout to
// limit the damage, but a longer deadline for race builds.
ctx, cancel := context.WithTimeout(ctx, testutils.SucceedsSoonDuration())
// Failures in this test often present as a deadlock.
// We have a relatively high timeout since this test flakes in leader leases,
// as it keeps withdrawing/granting store liveness support.
ctx, cancel := context.WithTimeout(ctx, 3*testutils.DefaultSucceedsSoonDuration)
defer cancel()

const numGetWorkers = 16
Expand Down

0 comments on commit 5ebd0b3

Please sign in to comment.