Skip to content

spanconfigreconcilerccl: deflake spanconfigreconcilerccl_test #155167

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 10, 2025
+7 −0
Merged

spanconfigreconcilerccl: deflake spanconfigreconcilerccl_test #155167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions pkg/spanconfig/spanconfigtestutils/spanconfigtestcluster/cluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,9 @@ func (h *Handle) InitializeTenant(ctx context.Context, tenID roachpb.TenantID) *
SpanConfig: h.scKnobs,
GCJob: &tenantGCJobKnobs,
UpgradeManager: serverUpgradeKnobs,
SQLExecutor: &sql.ExecutorTestingKnobs{
UseTransactionalDescIDGenerator: true,
},
},
}
var err error
Expand Down
4 changes: 4 additions & 0 deletions pkg/sql/planner.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import (
"github.com/cockroachdb/cockroach/pkg/sql/catalog"
"github.com/cockroachdb/cockroach/pkg/sql/catalog/catsessiondata"
"github.com/cockroachdb/cockroach/pkg/sql/catalog/colinfo"
"github.com/cockroachdb/cockroach/pkg/sql/catalog/descidgen"
"github.com/cockroachdb/cockroach/pkg/sql/catalog/descpb"
"github.com/cockroachdb/cockroach/pkg/sql/catalog/descs"
"github.com/cockroachdb/cockroach/pkg/sql/catalog/lease"
Expand Down Expand Up @@ -462,6 +463,9 @@ func newInternalPlanner(
p.extendedEvalCtx.NodeID = execCfg.NodeInfo.NodeID
p.extendedEvalCtx.Locality = execCfg.Locality
p.extendedEvalCtx.DescIDGenerator = execCfg.DescIDGenerator
if execCfg.TestingKnobs.UseTransactionalDescIDGenerator && txn != nil {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ah nice find. this probably would have been affecting other tests too.

p.extendedEvalCtx.DescIDGenerator = descidgen.NewTransactionalGenerator(execCfg.Settings, execCfg.Codec, txn)
}

p.sessionDataMutatorIterator = smi

Expand Down