Skip to content

clusterversion: bump binaryMinSupportedVersion for starting 21.1#55520

Merged
craig[bot] merged 2 commits intocockroachdb:masterfrom
thoszhang:start-21.1
Nov 7, 2020
Merged

clusterversion: bump binaryMinSupportedVersion for starting 21.1#55520
craig[bot] merged 2 commits intocockroachdb:masterfrom
thoszhang:start-21.1

Conversation

@thoszhang
Copy link
Copy Markdown

@thoszhang thoszhang commented Oct 13, 2020

sql/catalog: remove TestFinalizeVersionEnablesRangefeedUpdates

This mixed-version test isn't needed anymore.

Release note: None


clusterversion: bump binaryMinSupportedVersion for starting 21.1

Following up on introducing a new cluster version for development on
21.1, this patch bumps the binaryMinSupportedVersion to Version20_2.

Release note: None

@thoszhang thoszhang requested a review from dt October 13, 2020 18:12
@cockroach-teamcity
Copy link
Copy Markdown
Member

This change is Reviewable

@thoszhang
Copy link
Copy Markdown
Author

As I understand it, VersionStart20_2 is the right version here because it includes all the 20.2 prereleases, and setting it to Version20_1 last time (instead of VersionStart20_1) was incorrect. I'm going off of @andreimatei's comment here.

@dt
Copy link
Copy Markdown
Contributor

dt commented Oct 13, 2020

I think we got confused on the same point last time too: #49590 (comment)

@thoszhang
Copy link
Copy Markdown
Author

Okay, having read the issue, I think Version20_2 does make more sense. I'll update it.

It does feel a little weird to set the minimum supported version to a version we just created. I'm concerned about breaking things unexpectedly because of this. Let's see what happens on CI first of all.

@dt
Copy link
Copy Markdown
Contributor

dt commented Oct 14, 2020

I think the idea is 21.1 is only compatible with 20.2, and thus 21.1 work only needs to consider 20.2 when handling mixed version, not whatever mid-cycle development versions came before 20.2.0 (which could be as old as basically being 20.1).

@thoszhang thoszhang changed the title clusterversion: bump binaryMinSupportedVersion for starting 21.1 clusterversion,roachtest: set up for 21.1 Oct 30, 2020
@thoszhang
Copy link
Copy Markdown
Author

Rebased on top of #56163.

I think once this merges, we can finally tag something on master as v21.1.0-alpha.00000000.

@thoszhang
Copy link
Copy Markdown
Author

The problem now is that for acceptance/version-upgrade to pass in the CI tests, I need the build to be tagged as v21.1.0. I guess I could tag an earlier commit instead, but that doesn't seem right.

@thoszhang
Copy link
Copy Markdown
Author

Hmm, I think the way to do this might be to just bump binaryMinSupportedVersion in a later commit after v21.1.0 has already been tagged on master. Let me try that.

@thoszhang thoszhang changed the title clusterversion,roachtest: set up for 21.1 clusterversion: bump binaryMinSupportedVersion for starting 21.1 Nov 6, 2020
Lucy Zhang added 2 commits November 6, 2020 18:19
This mixed-version test isn't needed anymore.

Release note: None
Following up on introducing a new cluster version for development on
21.1, this patch bumps the `binaryMinSupportedVersion` to `Version20_2`.

Release note: None
@thoszhang
Copy link
Copy Markdown
Author

This PR now only bumps binaryMinSupportedVersion, like it did originally. (There's also another commit to get rid of a mixed-version test that we don't need anymore.) acceptance/mixed-version now works locally for me, so let's try this.

bors r+

@craig
Copy link
Copy Markdown
Contributor

craig bot commented Nov 7, 2020

Build succeeded:

@craig craig bot merged commit 61c96aa into cockroachdb:master Nov 7, 2020
@thoszhang thoszhang deleted the start-21.1 branch November 7, 2020 02:39
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.

3 participants