Skip to content

logictest: use v22_2 schema in mixed version test#98695

Merged
craig[bot] merged 1 commit intocockroachdb:masterfrom
jeffswenson:jeffswenson-mixed-version-test
Mar 15, 2023
Merged

logictest: use v22_2 schema in mixed version test#98695
craig[bot] merged 1 commit intocockroachdb:masterfrom
jeffswenson:jeffswenson-mixed-version-test

Conversation

@jeffswenson
Copy link
Copy Markdown
Collaborator

Previously, the v22.2-v23.1 mixed version test was using the v22.2 version gate with a v23.1 schema. This caused the alter_table test to fail on PR #98446. The lease protocol only works if the version gates and the schema are in sync.

As part of this change I simplified the version configuration in the logic tests so that the only version key is the bootstrap version. It doesn't really make sense to specify a binary version different than the build version. The binary will always have the build version's behavior.

This change also deletes the local-v1.1-at-v1.0-noupgrade test. The version can't be described by a version key and the tests do not represent a situation that occurs in real world deployments.

Part of #94843

Release note: None

@cockroach-teamcity
Copy link
Copy Markdown
Member

This change is Reviewable

@jeffswenson jeffswenson force-pushed the jeffswenson-mixed-version-test branch from 6a9d819 to 16253ce Compare March 15, 2023 19:05
@jeffswenson jeffswenson marked this pull request as ready for review March 15, 2023 19:07
@jeffswenson jeffswenson requested a review from a team as a code owner March 15, 2023 19:07
@jeffswenson jeffswenson requested a review from michae2 March 15, 2023 19:07
Copy link
Copy Markdown
Contributor

@ajwerner ajwerner left a comment

Choose a reason for hiding this comment

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

Nice

@@ -1,5 +1,4 @@
# LogicTest: default-configs local-mixed-22.2-23.1

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Nit keep this

Copy link
Copy Markdown
Collaborator

@michae2 michae2 left a comment

Choose a reason for hiding this comment

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

:lgtm:

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


pkg/sql/logictest/logictestbase/logictestbase.go line 59 at r1 (raw file):

	// bootstrapped at.
	BootstrapVersion clusterversion.Key
	// DisableUpgrade prevents the cluster from automatically ruinng upgrading

typo: delete "ruinng"

@jeffswenson jeffswenson force-pushed the jeffswenson-mixed-version-test branch from 16253ce to 19a01e5 Compare March 15, 2023 19:38
@jeffswenson
Copy link
Copy Markdown
Collaborator Author

bors r+

@craig
Copy link
Copy Markdown
Contributor

craig bot commented Mar 15, 2023

Build failed (retrying...):

@jeffswenson
Copy link
Copy Markdown
Collaborator Author

bors -

@craig
Copy link
Copy Markdown
Contributor

craig bot commented Mar 15, 2023

Did you mean "r-"?

@jeffswenson
Copy link
Copy Markdown
Collaborator Author

bors r-

@craig
Copy link
Copy Markdown
Contributor

craig bot commented Mar 15, 2023

Canceled.

@jeffswenson jeffswenson force-pushed the jeffswenson-mixed-version-test branch from 19a01e5 to 49d7658 Compare March 15, 2023 22:13
Previously, the v22.2-v23.1 mixed version test was using the v22.2
version gate with a v23.1 schema. This caused the alter_table test to
fail on PR cockroachdb#98446. The lease protocol only works if the version gates
and the schema are in sync.

As part of this change I simplified the version configuration in the
logic tests so that the only version key is the bootstrap version. It
doesn't really make sense to specify a binary version different than the
build version. The binary will always have the build version's behavior.

This change also deletes the local-v1.1-at-v1.0-noupgrade test. The
version can't be described by a version key and the tests do not
represent a situation that occurs in real world deployments.

Part of cockroachdb#94843

Release note: None
@jeffswenson jeffswenson force-pushed the jeffswenson-mixed-version-test branch from 49d7658 to 4424f86 Compare March 15, 2023 22:14
@jeffswenson
Copy link
Copy Markdown
Collaborator Author

bors r+

@craig
Copy link
Copy Markdown
Contributor

craig bot commented Mar 15, 2023

Build succeeded:

@craig craig bot merged commit 1d2a647 into cockroachdb:master Mar 15, 2023
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.

4 participants