Commit 5b2ff6a
committed
mixedversion: remove special case for skipping current version
In the past, we used to bump CRDB's minSupportedVersion _before_
bumping CRDB's current version.
Consider the old version bump process:
1. Bump minimum supported version (e.g. 25.2→25.3)
2. Bump current version (e.g. 25.4→26.1)
3. Bump minimum supported version again (e.g. 25.3→25.4)
After the first step, we would be in a state where the
mixed version framework would see v25.3 as a skippable
version (.1 and .3 ordinal versions are skippable), but
since the minimum supported version is 25.3, 25.2→25.4
is (temporarily) not a legal upgrade.
This required a special case to disallow skip upgrades
in the case of this edge case. However, we now bump the
current version _first_. This means we no longer need
to protect against the above and we actually hit a
different bug.
Since we now bump the current version first, the special
case will always view the current version as having multiple
supported predecessors and force a skip upgrade even if not
applicable.1 parent ae0b3d7 commit 5b2ff6a
File tree
2 files changed
+0
-12
lines changed- pkg/cmd/roachtest/roachtestutil/mixedversion
2 files changed
+0
-12
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
14 | 14 | | |
15 | 15 | | |
16 | 16 | | |
17 | | - | |
18 | 17 | | |
19 | 18 | | |
20 | 19 | | |
| |||
39 | 38 | | |
40 | 39 | | |
41 | 40 | | |
42 | | - | |
43 | 41 | | |
44 | 42 | | |
45 | 43 | | |
| |||
Lines changed: 0 additions & 10 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
79 | 79 | | |
80 | 80 | | |
81 | 81 | | |
82 | | - | |
83 | 82 | | |
84 | 83 | | |
85 | 84 | | |
| |||
94 | 93 | | |
95 | 94 | | |
96 | 95 | | |
97 | | - | |
98 | 96 | | |
99 | 97 | | |
100 | 98 | | |
| |||
613 | 611 | | |
614 | 612 | | |
615 | 613 | | |
616 | | - | |
617 | | - | |
618 | | - | |
619 | | - | |
620 | | - | |
621 | | - | |
622 | | - | |
623 | | - | |
624 | 614 | | |
625 | 615 | | |
626 | 616 | | |
| |||
0 commit comments