Skip to content

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

Merged
craig[bot] merged 4 commits intocockroachdb:masterfrom
adityamaru:audit-dr-jobs-tests
Apr 6, 2023
Merged

upgrades,backupccl: audit mixed version and upgrade tests#100696
craig[bot] merged 4 commits intocockroachdb:masterfrom
adityamaru:audit-dr-jobs-tests

Conversation

@adityamaru
Copy link
Copy Markdown
Contributor

Please see individual commits.

Informs: #100552

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 a team, dt and msbutler 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
Copy Markdown
Member

This change is Reviewable

@adityamaru adityamaru added the backport-23.1.x PAST MAINTENANCE SUPPORT: 23.1 patch releases via ER request only label Apr 5, 2023
@dt
Copy link
Copy Markdown
Contributor

dt commented Apr 5, 2023

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

@adityamaru
Copy link
Copy Markdown
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.

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
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
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
@dt
Copy link
Copy Markdown
Contributor

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
Copy Markdown
Contributor Author

TFTR!

bors r=dt

@adityamaru
Copy link
Copy Markdown
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
Copy Markdown
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
Copy Markdown
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
Copy Markdown

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport-23.1.x PAST MAINTENANCE SUPPORT: 23.1 patch releases via ER request only

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants