Skip to content

roachtest: fix flags used in multitenant-upgrade for versions >= v21.2#73145

Merged
craig[bot] merged 1 commit intocockroachdb:masterfrom
AlexTalks:fix_mt_upgrade
Nov 29, 2021
Merged

roachtest: fix flags used in multitenant-upgrade for versions >= v21.2#73145
craig[bot] merged 1 commit intocockroachdb:masterfrom
AlexTalks:fix_mt_upgrade

Conversation

@AlexTalks
Copy link
Copy Markdown
Contributor

@AlexTalks AlexTalks commented Nov 24, 2021

Previously, the multitenant-upgrade test had several workarounds and
branches for dealing with predecessor versions less than v21.2,
particularly the fact that these versions did not support the --store
flag passed on the mt start-sql CLI command. This was introduced
in #71040, and subsequently incorporated into the roachtest (including
workarounds) in #71604. Now that the current version is v22.1, and thus
the predecessor version supports the --store flag, it is necessary to
remove the workaround in order to ensure proper functionality of the
test. Additionally, this change cleans up an even earlier workaround
for validating the cluster version for predecessor versions less than
v21.1.2.

Fixes #72971.

Release note: None

@AlexTalks AlexTalks requested a review from tbg November 24, 2021 23:22
@cockroach-teamcity
Copy link
Copy Markdown
Member

This change is Reviewable

Previously, the `multitenant-upgrade` test had several workarounds and
branches for dealing with predecessor versions less than v21.2,
particularly the fact that these versions did not support the `--store`
flag passed on the `mt start-sql` CLI command.  This was introduced
in cockroachdb#71040, and subsequently incorporated into the roachtest (including
workarounds) in cockroachdb#71604.  Now that the current version is v22.1, and thus
the predecessor version supports the `--store` flag, it is necessary to
remove the workaround in order to ensure proper functionality of the
test.  Additionally, this change cleans up an even earlier workaround
for validating the cluster version for predecessor versions less than
v21.1.2.

Fixes cockroachdb#72971.

Release note: None
Copy link
Copy Markdown
Member

@tbg tbg left a comment

Choose a reason for hiding this comment

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

Thank you!

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

@AlexTalks
Copy link
Copy Markdown
Contributor Author

bors r+

@craig
Copy link
Copy Markdown
Contributor

craig bot commented Nov 29, 2021

Build succeeded:

@craig craig bot merged commit bdbd2e6 into cockroachdb:master Nov 29, 2021
@AlexTalks AlexTalks deleted the fix_mt_upgrade branch November 29, 2021 23:55
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: multitenant-upgrade failed

3 participants