mirrors/etcd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replace all etcd versions with the centralized definitions

Browse Source 
We have already defined all the constant etcd versions in the
centralized place api/version/version.go. So we should replace all
the versions with the centralized definitions.
This commit is contained in:
Benjamin Wang
2022-06-13 14:01:21 +08:00
parent 4f202a6429
commit 5f8cd5bd39
10 changed files with 176 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
server/etcdserver/version/version_test.go
View File

@ -28,87 +28,83 @@ import (
"go.etcd.io/etcd/api/v3/version"
)
var (
V3_7 = semver.Version{Major: 3, Minor: 7}
)
func TestUpgradeSingleNode(t *testing.T) {
lg := zaptest.NewLogger(t)
c := newCluster(lg, 1, V3_6)
c := newCluster(lg, 1, version.V3_6)
c.StepMonitors()
assert.Equal(t, newCluster(lg, 1, V3_6), c)
assert.Equal(t, newCluster(lg, 1, version.V3_6), c)
c.ReplaceMemberBinary(0, V3_7)
c.ReplaceMemberBinary(0, version.V3_7)
c.StepMonitors()
c.StepMonitors()
assert.Equal(t, newCluster(lg, 1, V3_7), c)
assert.Equal(t, newCluster(lg, 1, version.V3_7), c)
}
func TestUpgradeThreeNodes(t *testing.T) {
lg := zaptest.NewLogger(t)
c := newCluster(lg, 3, V3_6)
c := newCluster(lg, 3, version.V3_6)
c.StepMonitors()
assert.Equal(t, newCluster(lg, 3, V3_6), c)
assert.Equal(t, newCluster(lg, 3, version.V3_6), c)
c.ReplaceMemberBinary(0, V3_7)
c.ReplaceMemberBinary(0, version.V3_7)
c.StepMonitors()
c.ReplaceMemberBinary(1, V3_7)
c.ReplaceMemberBinary(1, version.V3_7)
c.StepMonitors()
c.ReplaceMemberBinary(2, V3_7)
c.ReplaceMemberBinary(2, version.V3_7)
c.StepMonitors()
c.StepMonitors()
assert.Equal(t, newCluster(lg, 3, V3_7), c)
assert.Equal(t, newCluster(lg, 3, version.V3_7), c)
}
func TestDowngradeSingleNode(t *testing.T) {
lg := zaptest.NewLogger(t)
c := newCluster(lg, 1, V3_6)
c := newCluster(lg, 1, version.V3_6)
c.StepMonitors()
assert.Equal(t, newCluster(lg, 1, V3_6), c)
assert.Equal(t, newCluster(lg, 1, version.V3_6), c)
assert.NoError(t, c.Version().DowngradeEnable(context.Background(), &V3_5))
assert.NoError(t, c.Version().DowngradeEnable(context.Background(), &version.V3_5))
c.StepMonitors()
assert.Equal(t, V3_5, c.clusterVersion)
assert.Equal(t, version.V3_5, c.clusterVersion)
c.ReplaceMemberBinary(0, V3_5)
c.ReplaceMemberBinary(0, version.V3_5)
c.StepMonitors()
assert.Equal(t, newCluster(lg, 1, V3_5), c)
assert.Equal(t, newCluster(lg, 1, version.V3_5), c)
}
func TestDowngradeThreeNode(t *testing.T) {
lg := zaptest.NewLogger(t)
c := newCluster(lg, 3, V3_6)
c := newCluster(lg, 3, version.V3_6)
c.StepMonitors()
assert.Equal(t, newCluster(lg, 3, V3_6), c)
assert.Equal(t, newCluster(lg, 3, version.V3_6), c)
assert.NoError(t, c.Version().DowngradeEnable(context.Background(), &V3_5))
assert.NoError(t, c.Version().DowngradeEnable(context.Background(), &version.V3_5))
c.StepMonitors()
assert.Equal(t, V3_5, c.clusterVersion)
assert.Equal(t, version.V3_5, c.clusterVersion)
c.ReplaceMemberBinary(0, V3_5)
c.ReplaceMemberBinary(0, version.V3_5)
c.StepMonitors()
c.ReplaceMemberBinary(1, V3_5)
c.ReplaceMemberBinary(1, version.V3_5)
c.StepMonitors()
c.ReplaceMemberBinary(2, V3_5)
c.ReplaceMemberBinary(2, version.V3_5)
c.StepMonitors()
assert.Equal(t, newCluster(lg, 3, V3_5), c)
assert.Equal(t, newCluster(lg, 3, version.V3_5), c)
}
func TestNewerMemberCanReconnectDuringDowngrade(t *testing.T) {
lg := zaptest.NewLogger(t)
c := newCluster(lg, 3, V3_6)
c := newCluster(lg, 3, version.V3_6)
c.StepMonitors()
assert.Equal(t, newCluster(lg, 3, V3_6), c)
assert.Equal(t, newCluster(lg, 3, version.V3_6), c)
assert.NoError(t, c.Version().DowngradeEnable(context.Background(), &V3_5))
assert.NoError(t, c.Version().DowngradeEnable(context.Background(), &version.V3_5))
c.StepMonitors()
assert.Equal(t, V3_5, c.clusterVersion)
assert.Equal(t, version.V3_5, c.clusterVersion)
c.ReplaceMemberBinary(0, V3_5)
c.ReplaceMemberBinary(0, version.V3_5)
c.StepMonitors()
c.MemberCrashes(2)
@ -116,12 +112,12 @@ func TestNewerMemberCanReconnectDuringDowngrade(t *testing.T) {
c.MemberReconnects(2)
c.StepMonitors()
c.ReplaceMemberBinary(1, V3_5)
c.ReplaceMemberBinary(1, version.V3_5)
c.StepMonitors()
c.ReplaceMemberBinary(2, V3_5)
c.ReplaceMemberBinary(2, version.V3_5)
c.StepMonitors()
assert.Equal(t, newCluster(lg, 3, V3_5), c)
assert.Equal(t, newCluster(lg, 3, version.V3_5), c)
}
func newCluster(lg *zap.Logger, memberCount int, ver semver.Version) *clusterMock {