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

fix some typos related to downgrade

Browse Source
This commit is contained in:
ahrtr 2022-03-09 15:12:20 +08:00
parent 85d4567ead
commit 1ae5aa52de
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
etcdctl/README.md
View File

@ -1094,8 +1094,8 @@ After initial bootstrap, cluster members agree on the cluster version. Every 5 s
New members will refuse joining cluster with cluster version newer than theirs, thus preventing cluster from downgrading. New members will refuse joining cluster with cluster version newer than theirs, thus preventing cluster from downgrading.
Downgrade commands allow cluster administrator to force cluster version to be lowered to previous minor version, thus allowing to downgrade the cluster. Downgrade commands allow cluster administrator to force cluster version to be lowered to previous minor version, thus allowing to downgrade the cluster.
Downgrade should be is executed in stages: Downgrade should be executed in stages:
1. Verify that cluster is ready be downgraded by running `etcdctl downgrade validate <TARGET_VERSION>` 1. Verify that cluster is ready to be downgraded by running `etcdctl downgrade validate <TARGET_VERSION>`
2. Start the downgrade process by running `etcdctl downgrade enable <TARGET_VERSION>` 2. Start the downgrade process by running `etcdctl downgrade enable <TARGET_VERSION>`
3. For each cluster member: 3. For each cluster member:
1. Ensure that member is ready for downgrade by confirming that it wrote `The server is ready to downgrade` log. 1. Ensure that member is ready for downgrade by confirming that it wrote `The server is ready to downgrade` log.

4
server/etcdserver/version/monitor.go
View File

@ -101,11 +101,11 @@ func (m *Monitor) UpdateStorageVersionIfNeeded() {
if sv == nil || sv.Major != cv.Major || sv.Minor != cv.Minor { if sv == nil || sv.Major != cv.Major || sv.Minor != cv.Minor {
if sv != nil { if sv != nil {
m.lg.Info("storage version differs from storage version.", zap.String("cluster-version", cv.String()), zap.String("storage-version", sv.String())) m.lg.Info("cluster version differs from storage version.", zap.String("cluster-version", cv.String()), zap.String("storage-version", sv.String()))
} }
err := m.s.UpdateStorageVersion(semver.Version{Major: cv.Major, Minor: cv.Minor}) err := m.s.UpdateStorageVersion(semver.Version{Major: cv.Major, Minor: cv.Minor})
if err != nil { if err != nil {
m.lg.Error("failed update storage version", zap.String("cluster-version", cv.String()), zap.Error(err)) m.lg.Error("failed to update storage version", zap.String("cluster-version", cv.String()), zap.Error(err))
return return
} }
d := m.s.GetDowngradeInfo() d := m.s.GetDowngradeInfo()

2
server/storage/schema/schema.go
View File

@ -73,7 +73,7 @@ func UnsafeMigrate(lg *zap.Logger, tx backend.BatchTx, w WALVersion, target semv
} }
plan, err := newPlan(lg, current, target) plan, err := newPlan(lg, current, target)
if err != nil { if err != nil {
return fmt.Errorf("cannot create migration plan: %w", err) return fmt.Errorf("cannot create migration plan: %v", err)
} }
if target.LessThan(current) { if target.LessThan(current) {
minVersion := w.MinimalEtcdVersion() minVersion := w.MinimalEtcdVersion()