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.

Sign up for GitHub

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

Jump to bottom

upgrades,backupccl: audit mixed version and upgrade tests #100696

Merged
merged 4 commits into from
Apr 6, 2023
Merged

upgrades,backupccl: audit mixed version and upgrade tests #100696

merged 4 commits into from
Apr 6, 2023

Conversation

adityamaru
Copy link
Contributor

Please see individual commits.

Informs: #100552

@adityamaru
upgrades: rework job_info upgrade test
7c1df10 
This test has been rewritten to explicitly indicate
what version the test cluster is being bootstrapped
and upgraded to.

Informs: cockroachdb#100552
Release note: None
@adityamaru adityamaru requested review from dt, msbutler and a team April 5, 2023 13:44
@adityamaru adityamaru requested a review from a team as a code owner April 5, 2023 13:44
@cockroach-teamcity
Copy link
Member

This change is Reviewable

@adityamaru adityamaru added the backport-23.1.x Flags PRs that need to be backported to 23.1 label Apr 5, 2023
@dt
Copy link
Member

dt commented Apr 5, 2023

can you refresh my memory why we use X_Start instead of X-1?

@adityamaru
Copy link
Contributor Author

beforeVersion does end up using X-1 where X is whatever we listed in front of that option. So in this case it'll be 23_1Start - 1.

@adityamaru
upgrades: delete userfile corruption version gate
a570e41 
The userfile descriptor corruption version gate can
be safely deleted as all clusters upgrading to 23.1+
are guaranteed to have been upgraded to 22.2 prior to
that.

Informs: cockroachdb#100552
Release note: None
@adityamaru
backupccl: delete restore schema version gate
035887c 
This version gate was for clusters that were
not fully upgraded to 22.2. Clusters that upgrade
to 23.1+ are guaranteed to have run this migration
and so it is safe to delete.

Informs: cockroachdb#100552
Release note: None
@adityamaru
backupccl: bump version on restore mixed version test
b2262e5 
This change bumps the mixed version restore test
to use the current minimum binary version instead of
an older V22_2Start gate that will soon be deleted.

Informs: cockroachdb#100552
Release note: None
@adityamaru adityamaru force-pushed the audit-dr-jobs-tests branch from fc8d68e to b2262e5 Compare April 5, 2023 15:57
@adityamaru adityamaru mentioned this pull request Apr 5, 2023
Closed
@dt
Copy link
Member

dt commented Apr 5, 2023

Ugh, we should get rid of that X-1 and just have it specify the V22_2

@adityamaru
Copy link
Contributor Author

TFTR!

bors r=dt

@adityamaru
Copy link
Contributor Author

we should get rid of that X-1 and just have it specify the V22_2

Yeah that test should just always use binary min supported version

@craig
Copy link
Contributor

craig bot commented Apr 6, 2023

This PR was included in a batch that timed out, it will be automatically retried

@craig
Copy link
Contributor

craig bot commented Apr 6, 2023

Build succeeded:

@craig craig bot merged commit c1e32e0 into cockroachdb:master Apr 6, 2023
@blathers-crl
Copy link

blathers-crl bot commented Apr 6, 2023

Encountered an error creating backports. Some common things that can go wrong:

  1. The backport branch might have already existed.
  2. There was a merge conflict.
  3. The backport branch contained merge commits.

You might need to create your backport manually using the backport tool.

error creating merge commit from a570e41 to blathers/backport-release-23.1-100696: POST https://api.github.com/repos/cockroachdb/cockroach/merges: 409 Merge conflict []

you may need to manually resolve merge conflicts with the backport tool.

Backport to branch 23.1.x failed. See errors above.

🦉 Hoot! I am a Blathers, a bot for CockroachDB. My owner is dev-inf.

@adityamaru adityamaru deleted the audit-dr-jobs-tests branch April 6, 2023 13:31
@adityamaru adityamaru mentioned this pull request Apr 6, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dt dt dt approved these changes

@msbutler msbutler Awaiting requested review from msbutler

Assignees
No one assigned
Labels
backport-23.1.x Flags PRs that need to be backported to 23.1
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@adityamaru @cockroach-teamcity @dt