Skip to content

c2c: use shared process tenants in c2c unit tests#106560

Merged
craig[bot] merged 1 commit intocockroachdb:masterfrom
msbutler:butler-shared-process-unit-test
Jul 13, 2023
Merged

c2c: use shared process tenants in c2c unit tests#106560
craig[bot] merged 1 commit intocockroachdb:masterfrom
msbutler:butler-shared-process-unit-test

Conversation

@msbutler
Copy link
Copy Markdown
Collaborator

@msbutler msbutler commented Jul 10, 2023

For the foreseeable future, c2c will be run in a unified architecture with
shared process tenants. To better reflect this production environment, this
patch modifies the c2c unit test driver to use shared process tenants.

Epic: none

Release note: none

@msbutler msbutler self-assigned this Jul 10, 2023
@cockroach-teamcity
Copy link
Copy Markdown
Member

This change is Reviewable

@msbutler msbutler force-pushed the butler-shared-process-unit-test branch 2 times, most recently from ad7c7b4 to 9c7f02a Compare July 11, 2023 15:02
@msbutler msbutler force-pushed the butler-shared-process-unit-test branch 10 times, most recently from 23e99c8 to 7605fcb Compare July 12, 2023 15:07
@msbutler msbutler changed the title hack c2c: use shared process tenants in c2c unit tests Jul 12, 2023
@msbutler msbutler marked this pull request as ready for review July 12, 2023 18:12
@msbutler msbutler requested a review from a team as a code owner July 12, 2023 18:12
@msbutler msbutler requested review from lidorcarmel and stevendanna and removed request for a team July 12, 2023 18:12
@msbutler
Copy link
Copy Markdown
Collaborator Author

unrelated test flakes

Copy link
Copy Markdown
Collaborator

@stevendanna stevendanna left a comment

Choose a reason for hiding this comment

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

This seems reasonable to me. Thanks!

testTenant, destTenantConn := serverutils.StartTenant(c.T, c.DestSysServer,
base.TestTenantArgs{TenantID: c.Args.DestTenantID, DisableCreateTenant: true, SkipTenantCheck: true})
func (c *TenantStreamingClusters) StartDestTenant(ctx context.Context) func() error {
c.DestSysSQL.Exec(c.T, `ALTER TENANT $1 START SERVICE SHARED`, c.Args.DestTenantName)
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

I wonder if it is in our interest to also grant all capabilities to the tenant here.

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

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

I'm inclined to keep this as is for now. I took a look at our runbook(s) and our roachtests and we currently don't do any post cutover granting. I can add something in a follow up PR once we add something to the runbook around this.

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

I'm fine doing it later.

The runbook doesn't have the grants because it uses a configuration profile that creates a tenant with all capabilities by default. The roachtests do grant the exmpt_from_rate_limiting capability IIRC.

@msbutler msbutler force-pushed the butler-shared-process-unit-test branch from 7605fcb to 9d28010 Compare July 13, 2023 11:04
For the foreseeable future, c2c will be run in a unified architecture with
shared process tenants. To better reflect this production environment, this
patch modifies the c2c unit test driver to use shared process tenants.

Epic: none

Release note: none
@msbutler msbutler force-pushed the butler-shared-process-unit-test branch from 9d28010 to 908a369 Compare July 13, 2023 12:08
@msbutler
Copy link
Copy Markdown
Collaborator Author

TFTR!

bors r=stevendanna

@craig
Copy link
Copy Markdown
Contributor

craig bot commented Jul 13, 2023

Build succeeded:

@craig craig bot merged commit 708e6f0 into cockroachdb:master Jul 13, 2023
@msbutler
Copy link
Copy Markdown
Collaborator Author

blathers backport 23.1

@blathers-crl
Copy link
Copy Markdown

blathers-crl bot commented Jul 14, 2023

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 908a369 to blathers/backport-release-23.1-106560: POST https://api.github.com/repos/cockroachdb/cockroach/merges: 409 Merge conflict []

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

Backport to branch 23.1 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

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants