Merge cockroachdb#124941

124941: spanconfigtestcluster: don't set SkipWaitingForMVCCGC r=rafiss a=rafiss 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. fixes cockroachdb#123951 fixes cockroachdb#123823 Release note: None Co-authored-by: Rafi Shamim <[email protected]>
herkolategan · Jun 1, 2024 · d77b6e7 · d77b6e7
2 parents 1e4cab3 + 5613e5b
commit d77b6e7
Showing 1 changed file with 2 additions and 2 deletions.
diff --git 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,