Skip to content

mixedversion: add regression test for #157852 #158016

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+38 −0
Open

mixedversion: add regression test for #157852 #158016

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions pkg/cmd/roachtest/roachtestutil/mixedversion/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,8 @@ go_test(
embed = [":mixedversion"],
embedsrcs = ["testdata/test_releases.yaml"],
deps = [
"//pkg/build",
"//pkg/clusterversion",
"//pkg/cmd/roachtest/option",
"//pkg/cmd/roachtest/registry",
"//pkg/cmd/roachtest/roachtestutil",
Expand Down
36 changes: 36 additions & 0 deletions pkg/cmd/roachtest/roachtestutil/mixedversion/mixedversion_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ import (
"math/rand"
"testing"

"github.com/cockroachdb/cockroach/pkg/build"
"github.com/cockroachdb/cockroach/pkg/clusterversion"
"github.com/cockroachdb/cockroach/pkg/cmd/roachtest/option"
"github.com/cockroachdb/cockroach/pkg/cmd/roachtest/registry"
"github.com/cockroachdb/cockroach/pkg/cmd/roachtest/roachtestutil/clusterupgrade"
Expand Down Expand Up @@ -477,3 +479,37 @@ func TestSupportsSkipUpgradeTo(t *testing.T) {
expect(v, false)
}
}

// Regression test for #157852.
// This tests that our skip upgrade logic does not break when we are in the middle
// of the version bump process. We bump the current version and the minSupportedVersion
// separately, so we want to make sure that:
// 1. supportsSkipUpgradeTo does not let us perform a skip upgrade from a non supportedVersion.
// This edge case happens if we bump the minSupportedVersion first and there is only 1 supported
// previous release in the current series despite being a .2 or .4 release.
// 2. supportsSkipUpgradeTo does not let us perform a skip upgrade over a .2 or .4 release.
// This edge case happens if we bump the current version first and there could be 3 supported
// previous releases in the current series.
func TestSupportsSkipCurrentVersion(t *testing.T) {
mvt := newTest()

// Case 1: If the minimumSupportedVersion on the current release says there is only 1 supported
// previous release, then it doesn't matter if the previous release is an innovation or not,
// we can't skip over it.
numSupportedVersions := len(clusterversion.SupportedPreviousReleases())

// Case 2: If the current release is an innovation release, it means the previous release
// is _not_ an innovation, i.e. we can't skip over it.
currentRelease := clusterversion.Latest.ReleaseSeries()
isInnovationRelease := currentRelease.Minor == 1 || currentRelease.Minor == 3

// We can only perform a skip upgrade to the current version if it's not an innovation and
// there are multiple supported previous versions.
expected := !isInnovationRelease && numSupportedVersions > 1

// N.B. The predecessor is only used to determine if we should skip over the
// mixedversion test's minimum supported version, and not relevant for this test.
pred := clusterupgrade.MustParseVersion("24.2.1")
actual := mvt.supportsSkipUpgradeTo(pred, &clusterupgrade.Version{Version: version.MustParse(build.BinaryVersion())})
require.Equal(t, expected, actual)
}