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

version(ticdc): adjust cdc version range to 6.3.0-alpha ~ 8.0.0-alpha #6710

Merged
merged 4 commits into from
Aug 11, 2022
Merged

version(ticdc): adjust cdc version range to 6.3.0-alpha ~ 8.0.0-alpha #6710

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
73a9681
add ut for version.
3AceShowHand Aug 11, 2022
aee96f1
adjust version.
3AceShowHand Aug 11, 2022
0ea9814
add version check file.
3AceShowHand Aug 11, 2022
64c0cd7
Merge branch 'master' into version-check-alpha
3AceShowHand Aug 11, 2022
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
4 changes: 2 additions & 2 deletions pkg/version/check.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,10 @@ var (
defaultTiCDCVersion = semver.New("4.0.1")

// MinTiCDCVersion is the version of the minimal allowed TiCDC version.
MinTiCDCVersion = semver.New("6.3.0")
MinTiCDCVersion = semver.New("6.3.0-alpha")
// MaxTiCDCVersion is the version of the maximum allowed TiCDC version.
// for version `x.y.z`, max allowed `x+2.0.0`
MaxTiCDCVersion = semver.New("8.0.0")
MaxTiCDCVersion = semver.New("8.0.0-alpha")
)

var versionHash = regexp.MustCompile("-[0-9]+-g[0-9a-f]{7,}(-dev)?")
Expand Down
56 changes: 39 additions & 17 deletions pkg/version/check_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,21 +195,22 @@ func TestCheckClusterVersion(t *testing.T) {
}

func TestCompareVersion(t *testing.T) {
require.Equal(t, semver.New("4.0.0-rc").Compare(*semver.New("4.0.0-rc.2")), -1)
require.Equal(t, semver.New("4.0.0-rc.1").Compare(*semver.New("4.0.0-rc.2")), -1)
require.Equal(t, semver.New(removeVAndHash("4.0.0-rc-35-g31dae220")).Compare(*semver.New("4.0.0-rc.2")), -1)
require.Equal(t, semver.New(removeVAndHash("4.0.0-9-g30f0b014")).Compare(*semver.New("4.0.0-rc.1")), 1)

require.Equal(t, semver.New(removeVAndHash("4.0.0-rc-35-g31dae220")).Compare(*semver.New("4.0.0-rc.2")), -1)
require.Equal(t, semver.New(removeVAndHash("4.0.0-9-g30f0b014")).Compare(*semver.New("4.0.0-rc.1")), 1)
require.Equal(t, semver.New(removeVAndHash("v3.0.0-beta-211-g09beefbe0-dirty")).
Compare(*semver.New("3.0.0-beta")), 0)
require.Equal(t, semver.New(removeVAndHash("v3.0.5-dirty")).
Compare(*semver.New("3.0.5")), 0)
require.Equal(t, semver.New(removeVAndHash("v3.0.5-beta.12-dirty")).
Compare(*semver.New("3.0.5-beta.12")), 0)
require.Equal(t, semver.New(removeVAndHash("v2.1.0-rc.1-7-g38c939f-dirty")).
Compare(*semver.New("2.1.0-rc.1")), 0)
// build on master branch, `vx.y.z-master`
masterVersion := semver.New(removeVAndHash("v6.3.0-master"))
require.Equal(t, 1, masterVersion.Compare(*MinTiCDCVersion))

// pre-release version, `vx.y.z-alpha-nightly-yyyymmdd`
alphaVersion := semver.New(removeVAndHash("v6.3.0-alpha-nightly-20220202"))
require.Equal(t, 1, alphaVersion.Compare(*MinTiCDCVersion))

// release version, `vx.y.z.`
releaseVersion := semver.New(removeVAndHash("v6.3.0"))
require.Equal(t, 1, releaseVersion.Compare(*MinTiCDCVersion))

// build with uncommitted changes, `vx.y.z-dirty`
dirtyVersion := semver.New(removeVAndHash("v6.3.0-dirty"))
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Which one is greater between v6.3.0-dirty and v6.3.0?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

they are equal, since v6.3.0-dirty will be changed to v6.3.0 first before comparison.

require.Equal(t, 1, dirtyVersion.Compare(*MinTiCDCVersion))
require.Equal(t, 0, dirtyVersion.Compare(*semver.New("6.3.0")))
}

func TestReleaseSemver(t *testing.T) {
Expand Down Expand Up @@ -363,13 +364,13 @@ func TestCheckPDVersionError(t *testing.T) {
func TestCheckTiCDCVersion(t *testing.T) {
t.Parallel()

// only one capture in the cluster, it's ok
// all captures in the cluster in the same version which is the minimum supported one.
versions := map[string]struct{}{
"v6.3.0": {},
}
require.NoError(t, CheckTiCDCVersion(versions))

// 2 running instances in different versions both within the range, it's ok
// 2 different versions both within the range, it's ok
versions = map[string]struct{}{
"v6.3.0": {},
"v6.4.0": {},
Expand All @@ -391,6 +392,20 @@ func TestCheckTiCDCVersion(t *testing.T) {
err = CheckTiCDCVersion(versions)
require.Regexp(t, ".*all running cdc instance belong to 3 different versions.*", err)

versions = map[string]struct{}{
"v6.3.0": {},
"v8.0.0-alpha": {},
}
err = CheckTiCDCVersion(versions)
require.Regexp(t, "TiCDC .* not supported, only support version less than.*", err)

versions = map[string]struct{}{
"v6.3.0": {},
"v8.0.0-master": {},
}
err = CheckTiCDCVersion(versions)
require.Regexp(t, "TiCDC .* not supported, only support version less than.*", err)

versions = map[string]struct{}{
"v6.3.0": {},
"v8.0.0": {},
Expand All @@ -404,4 +419,11 @@ func TestCheckTiCDCVersion(t *testing.T) {
}
err = CheckTiCDCVersion(versions)
require.Regexp(t, "TiCDC .* not supported, the minimal compatible version.*", err)

versions = map[string]struct{}{
"v6.3.0-master": {},
"v7.0.0": {},
}
err = CheckTiCDCVersion(versions)
require.NoError(t, err)
}