From 5ebd0b3263c0276c23a2303b3994c13bb70b8ac4 Mon Sep 17 00:00:00 2001 From: Ibrahim Kettaneh Date: Thu, 5 Dec 2024 13:36:48 -0500 Subject: [PATCH] kvserver: deflake TestStoreRangeMergeConcurrentRequests Fixes: #136774 Release note: None --- pkg/kv/kvserver/client_merge_test.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkg/kv/kvserver/client_merge_test.go b/pkg/kv/kvserver/client_merge_test.go index e9ebf362fc6c..a4e59c1c52ea 100644 --- a/pkg/kv/kvserver/client_merge_test.go +++ b/pkg/kv/kvserver/client_merge_test.go @@ -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