Skip to content

server,testcluster: make more tests work with secondary tenants#107757

Merged
craig[bot] merged 1 commit intocockroachdb:masterfrom
knz:20230727-srv-tests
Jul 28, 2023
Merged

server,testcluster: make more tests work with secondary tenants#107757
craig[bot] merged 1 commit intocockroachdb:masterfrom
knz:20230727-srv-tests

Conversation

@knz
Copy link
Copy Markdown
Contributor

@knz knz commented Jul 27, 2023

Epic: CRDB-18499
Informs #76378.

@cockroach-teamcity
Copy link
Copy Markdown
Member

This change is Reviewable

@knz knz force-pushed the 20230727-srv-tests branch from 60680bf to 1205e26 Compare July 28, 2023 03:51
@knz knz requested review from stevendanna and yuzefovich July 28, 2023 03:58
@knz knz marked this pull request as ready for review July 28, 2023 03:58
@knz knz requested review from a team July 28, 2023 03:58
@knz knz requested review from a team as code owners July 28, 2023 03:58
@knz knz requested review from herkolategan, nkodali and renatolabs and removed request for a team July 28, 2023 03:58
@knz knz force-pushed the 20230727-srv-tests branch from 1205e26 to 3b495e7 Compare July 28, 2023 16:55
Copy link
Copy Markdown
Member

@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.

:lgtm:

Reviewed 2 of 2 files at r1, all commit messages.
Reviewable status: :shipit: complete! 1 of 0 LGTMs obtained (waiting on @herkolategan, @knz, @nkodali, @renatolabs, and @stevendanna)


pkg/testutils/testcluster/testcluster.go line 433 at r1 (raw file):

	// run the migrations up to the overridden BinaryVersion.
	if v := tc.Servers[0].BinaryVersionOverride(); v != (roachpb.Version{}) {
		if _, err := tc.storageConn.Exec(`SET CLUSTER SETTING version = $1`, v.String()); err != nil {

I'm assuming we need this independent of a similar change in #107808?


pkg/server/application_api/schema_inspection_test.go line 50 at r1 (raw file):

		// Disable the default test tenant for now as this tests fails with
		// it enabled. Tracked with #81590.
		DefaultTestTenant: base.TODOTestTenantDisabled,

nit: ditto for the linter.

@knz knz force-pushed the 20230727-srv-tests branch from 3b495e7 to 188689e Compare July 28, 2023 18:41
Copy link
Copy Markdown
Contributor Author

@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.

Reviewable status: :shipit: complete! 1 of 0 LGTMs obtained (waiting on @herkolategan, @nkodali, @renatolabs, @stevendanna, and @yuzefovich)


pkg/testutils/testcluster/testcluster.go line 433 at r1 (raw file):

Previously, yuzefovich (Yahor Yuzefovich) wrote…

I'm assuming we need this independent of a similar change in #107808?

Interesting remark. The two are indeed useful in the general case.
I'll let them merge as two separate PRs though.


pkg/server/application_api/schema_inspection_test.go line 50 at r1 (raw file):

Previously, yuzefovich (Yahor Yuzefovich) wrote…

nit: ditto for the linter.

Fixed.

@knz knz force-pushed the 20230727-srv-tests branch from 188689e to 62d791e Compare July 28, 2023 18:55
@knz knz added the db-cy-23 label Jul 28, 2023
@knz knz force-pushed the 20230727-srv-tests branch from 62d791e to 4c56b4f Compare July 28, 2023 21:31
@knz
Copy link
Copy Markdown
Contributor Author

knz commented Jul 28, 2023

TFYR

bors r=yuzefovich

@craig
Copy link
Copy Markdown
Contributor

craig bot commented Jul 28, 2023

Build succeeded:

@craig craig bot merged commit 879dde8 into cockroachdb:master Jul 28, 2023
@knz knz deleted the 20230727-srv-tests branch July 29, 2023 13:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants