Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

roachtest/version-upgrade: re-enable schema changer workload #100651

Merged
merged 1 commit into from
Apr 6, 2023

Conversation

fqazi
Copy link
Collaborator

@fqazi fqazi commented Apr 4, 2023

Previously, the schema changer workload was disabled inside the version upgrade test because of intermittent job errors. This patch re-enables this workload again for the version upgrade test. It also updates the test to handle mixed version declarative schema changer support.

Fixes: #100409

Release note: None

@cockroach-teamcity
Copy link
Member

This change is Reviewable

@renatolabs
Copy link
Contributor

Ops, I already closed #100409 since that was technically fixed by #100538. I'm excited about re-enabling the schemachange workload though.

@fqazi fqazi force-pushed the declarativeRandomFix branch 2 times, most recently from f08b040 to 472d75f Compare April 5, 2023 15:29
@fqazi fqazi marked this pull request as ready for review April 5, 2023 15:30
@fqazi fqazi requested a review from a team as a code owner April 5, 2023 15:30
@fqazi fqazi requested review from srosenberg, smg260 and a team and removed request for a team April 5, 2023 15:30
@@ -326,6 +326,31 @@ var opDeclarative = []bool{
validate: false,
}

var opDeclarativeVersion = []clusterversion.Key{
addColumn: clusterversion.V22_2,
Copy link
Contributor

Choose a reason for hiding this comment

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

Looks like we'd need to maintain this version list statement by statement, but I think that's probably fine.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

I was debating if we should use the check if supported function from the builder, but the problem is mixed version states here. The binary is built against a new version for the test, I'll add a comment with a rationale.

// This workload will maintain its own list of supported versions for declarative
// schema changer, since the cluster we are running against can be downlevel.
// The declarative schema changer builder does have a supported list but it's not
// sufficient for that reason.

Previously, the schema changer workload was disabled inside
the version upgrade test because of intermittent job errors.
This patch re-enables this workload again for the version
upgrade test. It also updates the test to handle mixed version
declarative schema changer support.

Fixes: cockroachdb#100709

Release note: None
@fqazi fqazi force-pushed the declarativeRandomFix branch from 472d75f to 3b998ad Compare April 6, 2023 16:24
@fqazi
Copy link
Collaborator Author

fqazi commented Apr 6, 2023

bors r+

@craig
Copy link
Contributor

craig bot commented Apr 6, 2023

Build succeeded:

@craig craig bot merged commit af563f8 into cockroachdb:master Apr 6, 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.

roachtest: acceptance/version-upgrade failed
4 participants