From 5613e5b5ddeaf4428f447b43ea041e225ed77c7f Mon Sep 17 00:00:00 2001 From: Rafi Shamim Date: Fri, 31 May 2024 16:00:38 -0400 Subject: [PATCH] spanconfigtestcluster: don't set SkipWaitingForMVCCGC This knob is no longer needed, and it seems to cause a rare flake with an error `relation "[107]" does not exist`. This is because part of the spanconfigsplitter test is to lookup a dropped a descriptor, and with the knob set, the descriptor can be removed too quickly for the test to be able to look at it. Release note: None --- .../spanconfigtestutils/spanconfigtestcluster/cluster.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/spanconfig/spanconfigtestutils/spanconfigtestcluster/cluster.go b/pkg/spanconfig/spanconfigtestutils/spanconfigtestcluster/cluster.go index 910e3b439b48..c282ed93697c 100644 --- a/pkg/spanconfig/spanconfigtestutils/spanconfigtestcluster/cluster.go +++ b/pkg/spanconfig/spanconfigtestutils/spanconfigtestcluster/cluster.go @@ -61,10 +61,10 @@ func (h *Handle) InitializeTenant(ctx context.Context, tenID roachpb.TenantID) * tenantState.cleanup = func() {} // noop } else { serverGCJobKnobs := testServer.SystemLayer().TestingKnobs().GCJob - tenantGCJobKnobs := sql.GCJobTestingKnobs{SkipWaitingForMVCCGC: true} + // Copy the GC job knobs from the server to the tenant. + tenantGCJobKnobs := sql.GCJobTestingKnobs{} if serverGCJobKnobs != nil { tenantGCJobKnobs = *serverGCJobKnobs.(*sql.GCJobTestingKnobs) - tenantGCJobKnobs.SkipWaitingForMVCCGC = true } tenantArgs := base.TestTenantArgs{ TenantID: tenID,