From 1ae5aa52de5bde7afc940fe8a75f58c7b43b9f3e Mon Sep 17 00:00:00 2001 From: ahrtr Date: Wed, 9 Mar 2022 15:12:20 +0800 Subject: [PATCH] fix some typos related to downgrade --- etcdctl/README.md | 4 ++-- server/etcdserver/version/monitor.go | 4 ++-- server/storage/schema/schema.go | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/etcdctl/README.md b/etcdctl/README.md index 66dfc619f..db273ec83 100644 --- a/etcdctl/README.md +++ b/etcdctl/README.md @@ -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. 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: -1. Verify that cluster is ready be downgraded by running `etcdctl downgrade validate ` +Downgrade should be executed in stages: +1. Verify that cluster is ready to be downgraded by running `etcdctl downgrade validate ` 2. Start the downgrade process by running `etcdctl downgrade enable ` 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. diff --git a/server/etcdserver/version/monitor.go b/server/etcdserver/version/monitor.go index 8ac8d8e8d..2ccc897a0 100644 --- a/server/etcdserver/version/monitor.go +++ b/server/etcdserver/version/monitor.go @@ -101,11 +101,11 @@ func (m *Monitor) UpdateStorageVersionIfNeeded() { if sv == nil || sv.Major != cv.Major || sv.Minor != cv.Minor { 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}) 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 } d := m.s.GetDowngradeInfo() diff --git a/server/storage/schema/schema.go b/server/storage/schema/schema.go index f3b29c011..889b4e8d7 100644 --- a/server/storage/schema/schema.go +++ b/server/storage/schema/schema.go @@ -73,7 +73,7 @@ func UnsafeMigrate(lg *zap.Logger, tx backend.BatchTx, w WALVersion, target semv } plan, err := newPlan(lg, current, target) 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) { minVersion := w.MinimalEtcdVersion()