Skip to content

Conversation

@fqazi
Copy link
Collaborator

@fqazi fqazi commented Oct 9, 2025

Previously, the span config reconciller tests when running under a tenant did not use the transactional descriptor ID generator, which could lead to flake. Additionally, the transactional ID generator also was not being used for creating internal objects, when the testing knob is enabled. This patch fixes the multi-tenant tests to use the transactional ID generator and enables it for internal queries as well.

Fixes: #154585

Release note: None

Previously, the span config reconciller tests when running under a
tenant did not use the transactional descriptor ID generator, which
could lead to flake. Additionally, the transactional ID generator also was
not being used for creating internal objects, when the testing knob is
enabled. This patch fixes the multi-tenant tests to use the
transactional ID generator and enables it for internal queries as well.

Fixes: cockroachdb#154585

Release note: None
@fqazi fqazi added the backport-all Flags PRs that need to be backported to all supported release branches label Oct 9, 2025
@fqazi fqazi requested review from a team as code owners October 9, 2025 18:21
@blathers-crl
Copy link

blathers-crl bot commented Oct 9, 2025

It looks like your PR touches production code but doesn't add or edit any test code. Did you consider adding tests to your PR?

🦉 Hoot! I am a Blathers, a bot for CockroachDB. My owner is dev-inf.

@cockroach-teamcity
Copy link
Member

This change is Reviewable

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.

@fqazi
Copy link
Collaborator Author

fqazi commented Oct 10, 2025

@rafiss TFTR

bors r+

@craig
Copy link
Contributor

craig bot commented Oct 10, 2025

@craig craig bot merged commit cee71c6 into cockroachdb:master Oct 10, 2025
33 of 34 checks passed
@blathers-crl
Copy link

blathers-crl bot commented Oct 10, 2025

Encountered an error creating backports. Some common things that can go wrong:

  1. The backport branch might have already existed.
  2. There was a merge conflict.
  3. The backport branch contained merge commits.

You might need to create your backport manually using the backport tool.


error creating merge commit from 26f37dd to blathers/backport-release-24.1-155167: POST https://api.github.com/repos/fqazi/cockroach/merges: 409 Merge conflict []

you may need to manually resolve merge conflicts with the backport tool.

Backport to branch release-24.1 failed. See errors above.


error creating merge commit from 26f37dd to blathers/backport-release-24.3-155167: POST https://api.github.com/repos/fqazi/cockroach/merges: 409 Merge conflict []

you may need to manually resolve merge conflicts with the backport tool.

Backport to branch release-24.3 failed. See errors above.


error creating merge commit from 26f37dd to blathers/backport-release-25.2-155167: POST https://api.github.com/repos/fqazi/cockroach/merges: 409 Merge conflict []

you may need to manually resolve merge conflicts with the backport tool.

Backport to branch release-25.2 failed. See errors above.


🦉 Hoot! I am a Blathers, a bot for CockroachDB. My owner is dev-inf.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport-all Flags PRs that need to be backported to all supported release branches backport-failed target-release-26.1.0

Projects

None yet

Development

Successfully merging this pull request may close these issues.

pkg/ccl/spanconfigccl/spanconfigreconcilerccl/spanconfigreconcilerccl_test: TestDataDriven failed

3 participants