Skip to content

Commit ba3762e

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 de6e4fb commit ba3762e

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
}
@@ -241,7 +240,6 @@ func TestRegionLivenessProberForLeases(t *testing.T) {
241240
// multi-region. and enable region liveness for testing.
242241
makeSettings := func() *cluster.Settings {
243242
cs := cluster.MakeTestingClusterSettings()
244-
instancestorage.ReclaimLoopInterval.Override(ctx, &cs.SV, 150*time.Millisecond)
245243
regionliveness.RegionLivenessEnabled.Override(ctx, &cs.SV, true)
246244
return cs
247245
}
@@ -478,7 +476,6 @@ func TestRegionLivenessProberForSQLInstances(t *testing.T) {
478476
// multi-region. and enable region liveness for testing.
479477
makeSettings := func() *cluster.Settings {
480478
cs := cluster.MakeTestingClusterSettings()
481-
// instancestorage.ReclaimLoopInterval.Override(ctx, &cs.SV, 150*time.Millisecond)
482479
regionliveness.RegionLivenessEnabled.Override(ctx, &cs.SV, true)
483480
instancestorage.PreallocatedCount.Override(ctx, &cs.SV, 1)
484481
return cs

0 commit comments

Comments
 (0)