From a476310c7b656c762812274f9b3700dc5752804e Mon Sep 17 00:00:00 2001 From: Andrew Werner Date: Mon, 1 Aug 2022 23:18:56 -0400 Subject: [PATCH] logictest: use deterministic ID generation in tenants In #85366, we introduced a mechanism to make descriptor ID generation transactional and, in the absence of parallelism, deterministic. That PR failed to set the knob for secondary tenant configurations. This commit rectifies that oversight. This should allow us to avoid flakes like: https://teamcity.cockroachdb.com/buildConfiguration/Cockroach_GitHubCiOptional/5939930?showRootCauses=false&expandBuildChangesSection=true&expandBuildProblemsSection=true&expandBuildTestsSection=true Release note: None --- pkg/sql/logictest/logic.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkg/sql/logictest/logic.go b/pkg/sql/logictest/logic.go index 462612209b47..5b554a0ff545 100644 --- a/pkg/sql/logictest/logic.go +++ b/pkg/sql/logictest/logic.go @@ -1283,7 +1283,8 @@ func (t *logicTest) newCluster( AllowSettingClusterSettings: true, TestingKnobs: base.TestingKnobs{ SQLExecutor: &sql.ExecutorTestingKnobs{ - DeterministicExplain: true, + DeterministicExplain: true, + UseTransactionalDescIDGenerator: true, }, SQLStatsKnobs: &sqlstats.TestingKnobs{ AOSTClause: "AS OF SYSTEM TIME '-1us'",