Skip to content

workload: support fixture import in multi-tenant mode#78418

Merged
craig[bot] merged 1 commit intocockroachdb:masterfrom
nvb:nvanbenschoten/mtImport
Mar 29, 2022
Merged

workload: support fixture import in multi-tenant mode#78418
craig[bot] merged 1 commit intocockroachdb:masterfrom
nvb:nvanbenschoten/mtImport

Conversation

@nvb
Copy link
Copy Markdown
Contributor

@nvb nvb commented Mar 24, 2022

Fixes #75449.

This commit fixes fixture import into tenants, which do not have access to the crdb_internal.gossip_liveness table. This fixes the following:

  • [cockroach] workload fixtures import
  • [cockroach] workload init --data-loader=IMPORT

Release justification: low-risk change that improves workload functionality.

@nvb nvb requested a review from knz March 24, 2022 13:26
@cockroach-teamcity
Copy link
Copy Markdown
Member

This change is Reviewable

Copy link
Copy Markdown
Contributor

@knz knz left a comment

Choose a reason for hiding this comment

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

:lgtm: with request

Reviewed 1 of 1 files at r1, all commit messages.
Reviewable status: :shipit: complete! 1 of 0 LGTMs obtained (waiting on @nvanbenschoten)


pkg/ccl/workloadccl/fixture.go, line 358 at r1 (raw file):

			// If the query is unsupported because we're in multi-tenant mode. Assume
			// that the cluster has 1 node for the purposes of running CSV servers.
			// Tenants won't use DistSQL to parallelize IMPORT across SQL pods.

Can you file a follow-up issue, link its ID from this comment, then label that issue with A-multi-tenancy and ping adam on it. Thanks

Fixes cockroachdb#75449.

This commit fixes fixture import into tenants, which do not have access
to the `crdb_internal.gossip_liveness` table. This fixes the following:
- `[cockroach] workload fixtures import`
- `[cockroach] workload init --data-loader=IMPORT`

Release justification: low-risk change that improves workload functionality.
@nvb nvb force-pushed the nvanbenschoten/mtImport branch from e38b65d to 11d9b3d Compare March 29, 2022 16:55
Copy link
Copy Markdown
Contributor Author

@nvb nvb left a comment

Choose a reason for hiding this comment

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

TFTR!

bors r+

Reviewable status: :shipit: complete! 0 of 0 LGTMs obtained (and 1 stale) (waiting on @knz)


pkg/ccl/workloadccl/fixture.go, line 358 at r1 (raw file):

Previously, knz (kena) wrote…

Can you file a follow-up issue, link its ID from this comment, then label that issue with A-multi-tenancy and ping adam on it. Thanks

Done in #78968.

@craig craig bot merged commit 897c2da into cockroachdb:master Mar 29, 2022
@craig
Copy link
Copy Markdown
Contributor

craig bot commented Mar 29, 2022

Build succeeded:

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.

multi-tenant: enable IMPORT for workload init in multi-tenant mode

3 participants