Skip to content

Conversation

@yuzefovich
Copy link
Member

Fixes: #98816
Informs: #142799
Release note: None

@yuzefovich yuzefovich requested a review from a team as a code owner October 27, 2025 20:12
@yuzefovich yuzefovich requested review from aerfrei and removed request for a team October 27, 2025 20:12
@cockroach-teamcity
Copy link
Member

This change is Reviewable

// Test uses SPLIT AT, which isn't currently supported for
// secondary tenants. Tracked with #76378.
DefaultTestTenant: base.TODOTestTenantDisabled,
DefaultTestTenant: base.TestDoesNotWorkWithSecondaryTenantsButWeDontKnowWhyYet(142799),
Copy link
Contributor

Choose a reason for hiding this comment

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

Were these comments (that SPLIT AT isn't supported for secondary tenants) no longer true?
Are we now tracking these exclusively in #142799 and not #76378?

Copy link
Member Author

Choose a reason for hiding this comment

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

The comments here are definitely stale, which is why I decided to remove them to avoid possible confusion. (In particular, when this comment was added, we needed to explicitly add tenantcapabilitiespb.CanAdminSplit to the tenant, but now this capability is granted by default, so no need to do anything about it. Perhaps the test will just work, perhaps it'll require some other adjustments, but SPLIT AT should just work.)

I'm working on doing first level triage of all things that reference #76378 with the goal of closing that issue soon. All tests / packages that have test tenant randomization disabled will have a separate, specific issue, and #142799 is the common issue for all CDC tests.

const nodes = 4
args := base.TestClusterArgs{
ServerArgs: base.TestServerArgs{
DefaultTestTenant: base.TODOTestTenantDisabled, // need nodelocal and splits.
Copy link
Contributor

Choose a reason for hiding this comment

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

This comment too, is it not accurate for why this test wasn't working for tenants?

Copy link
Member Author

Choose a reason for hiding this comment

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

This comment is somewhat stale for sure. CanUseNodelocalStorage capability should now be granted in the tests by default (see testServer.grantDefaultTenantCapabilities).


ctx := context.Background()
s, db, _ := serverutils.StartServer(t, base.TestServerArgs{
// TODO(#98816): cdctest.GetHydratedTableDescriptor does not work with tenant dbs.
Copy link
Contributor

Choose a reason for hiding this comment

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

Awesome, nice that we have this test back.

@aerfrei
Copy link
Contributor

aerfrei commented Oct 28, 2025

Is the extended CI failure related? The unit test failure might be a flake.

Copy link
Member Author

@yuzefovich yuzefovich left a comment

Choose a reason for hiding this comment

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

TFTR!

Both essential CI and extended CI failures seem like flakes.

Reviewable status: :shipit: complete! 0 of 0 LGTMs obtained (waiting on @aerfrei)

const nodes = 4
args := base.TestClusterArgs{
ServerArgs: base.TestServerArgs{
DefaultTestTenant: base.TODOTestTenantDisabled, // need nodelocal and splits.
Copy link
Member Author

Choose a reason for hiding this comment

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

This comment is somewhat stale for sure. CanUseNodelocalStorage capability should now be granted in the tests by default (see testServer.grantDefaultTenantCapabilities).

// Test uses SPLIT AT, which isn't currently supported for
// secondary tenants. Tracked with #76378.
DefaultTestTenant: base.TODOTestTenantDisabled,
DefaultTestTenant: base.TestDoesNotWorkWithSecondaryTenantsButWeDontKnowWhyYet(142799),
Copy link
Member Author

Choose a reason for hiding this comment

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

The comments here are definitely stale, which is why I decided to remove them to avoid possible confusion. (In particular, when this comment was added, we needed to explicitly add tenantcapabilitiespb.CanAdminSplit to the tenant, but now this capability is granted by default, so no need to do anything about it. Perhaps the test will just work, perhaps it'll require some other adjustments, but SPLIT AT should just work.)

I'm working on doing first level triage of all things that reference #76378 with the goal of closing that issue soon. All tests / packages that have test tenant randomization disabled will have a separate, specific issue, and #142799 is the common issue for all CDC tests.

@yuzefovich
Copy link
Member Author

TFTRs!

bors r+

@yuzefovich
Copy link
Member Author

bors r+

@craig
Copy link
Contributor

craig bot commented Oct 28, 2025

@craig craig bot merged commit 529ffb8 into cockroachdb:master Oct 28, 2025
21 of 23 checks passed
@yuzefovich yuzefovich deleted the tenant-cdc branch October 28, 2025 22:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

changefeedccl: fix broken tests for tenants

4 participants