Skip to content

Commit a68cf6f

Browse files
committed
ccl/multiregionccl: deflake TestRegionLivenessProber
Previously, TestRegionLivenessProber could flake because the synthetic region probe timeout in this test could have been hit by the instance reclaim logic. This test was incorrectly running this logic every 150ms increasing the risk of flakes. To address this, this patch leaves this setting on the default setting of 10 minutes, so the region failure should only be detected by the intentionally executed test logic. Fixes: #151747 Release note: None
1 parent a6a632c commit a68cf6f

File tree

1 file changed

+0
-3
lines changed

1 file changed

+0
-3
lines changed

pkg/ccl/multiregionccl/regionliveness_test.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@ func TestRegionLivenessProber(t *testing.T) {
7676
// multi-region. and enable region liveness for testing.
7777
makeSettings := func() *cluster.Settings {
7878
cs := cluster.MakeTestingClusterSettings()
79-
instancestorage.ReclaimLoopInterval.Override(ctx, &cs.SV, 150*time.Millisecond)
8079
regionliveness.RegionLivenessEnabled.Override(ctx, &cs.SV, true)
8180
return cs
8281
}
@@ -239,7 +238,6 @@ func TestRegionLivenessProberForLeases(t *testing.T) {
239238
// multi-region. and enable region liveness for testing.
240239
makeSettings := func() *cluster.Settings {
241240
cs := cluster.MakeTestingClusterSettings()
242-
instancestorage.ReclaimLoopInterval.Override(ctx, &cs.SV, 150*time.Millisecond)
243241
regionliveness.RegionLivenessEnabled.Override(ctx, &cs.SV, true)
244242
return cs
245243
}
@@ -484,7 +482,6 @@ func TestRegionLivenessProberForSQLInstances(t *testing.T) {
484482
// multi-region. and enable region liveness for testing.
485483
makeSettings := func() *cluster.Settings {
486484
cs := cluster.MakeTestingClusterSettings()
487-
// instancestorage.ReclaimLoopInterval.Override(ctx, &cs.SV, 150*time.Millisecond)
488485
regionliveness.RegionLivenessEnabled.Override(ctx, &cs.SV, true)
489486
instancestorage.PreallocatedCount.Override(ctx, &cs.SV, 1)
490487
return cs

0 commit comments

Comments
 (0)