Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

etcdserver: remove v2 version set; e2e: fix tests.

Browse Source
This commit is contained in:
yoyinzyc
2019-12-04 16:45:29 -08:00
parent ed5a01a48d
commit 7784ca8997
4 changed files with 48 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
etcdserver/api/membership/cluster.go
View File

@@ -247,7 +247,12 @@ func (c *RaftCluster) Recover(onSet func(*zap.Logger, *semver.Version)) {
defer c.Unlock()
c.members, c.removed = membersFromStore(c.lg, c.v2store)
c.version = clusterVersionFromBackend(c.lg, c.be)
if c.be != nil {
c.version = clusterVersionFromBackend(c.lg, c.be)
} else {
c.version = clusterVersionFromStore(c.lg, c.v2store)
}
mustDetectDowngrade(c.lg, c.version)
onSet(c.lg, c.version)
@@ -766,7 +771,7 @@ func clusterVersionFromBackend(lg *zap.Logger, be backend.Backend) *semver.Versi
if lg != nil {
lg.Panic(
"unexpected number of keys when getting cluster version from backend",
zap.Int("number fo keys", len(keys)),
zap.Int("number-of-key", len(keys)),
)
}
}