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

etcdctl: Use minor versions for downgrade

Browse Source
This commit is contained in:
Marek Siarkowicz 2022-02-22 16:30:08 +01:00
parent c1c2f1233d
commit 42faf9fe06
3 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
etcdctl/README.md
View File

@ -1116,10 +1116,10 @@ DOWNGRADE VALIDATE validate downgrade capability before starting downgrade.
#### Example #### Example
```bash ```bash
./etcdctl downgrade validate 3.5.0 ./etcdctl downgrade validate 3.5
Downgrade validate success, cluster version 3.6.0 Downgrade validate success, cluster version 3.6
./etcdctl downgrade validate 3.4.0 ./etcdctl downgrade validate 3.4
Error: etcdserver: invalid downgrade target version Error: etcdserver: invalid downgrade target version
``` ```
@ -1131,8 +1131,8 @@ DOWNGRADE ENABLE starts a downgrade action to cluster.
#### Example #### Example
```bash ```bash
./etcdctl downgrade enable 3.5.0 ./etcdctl downgrade enable 3.5
Downgrade enable success, cluster version 3.6.0 Downgrade enable success, cluster version 3.6
``` ```
### DOWNGRADE CANCEL \<TARGET_VERSION\> ### DOWNGRADE CANCEL \<TARGET_VERSION\>
@ -1143,7 +1143,7 @@ DOWNGRADE CANCEL cancels the ongoing downgrade action to cluster.
```bash ```bash
./etcdctl downgrade cancel ./etcdctl downgrade cancel
Downgrade cancel success, cluster version 3.6.0 Downgrade cancel success, cluster version 3.5
``` ```
## Concurrency commands ## Concurrency commands

6
etcdctl/ctlv3/command/printer_simple.go
View File

@ -177,13 +177,13 @@ func (s *simplePrinter) MoveLeader(leader, target uint64, r v3.MoveLeaderRespons
} }
func (s *simplePrinter) DowngradeValidate(r v3.DowngradeResponse) { func (s *simplePrinter) DowngradeValidate(r v3.DowngradeResponse) {
fmt.Printf("Downgrade validate success, cluster version %s", r.Version) fmt.Printf("Downgrade validate success, cluster version %s\n", r.Version)
} }
func (s *simplePrinter) DowngradeEnable(r v3.DowngradeResponse) { func (s *simplePrinter) DowngradeEnable(r v3.DowngradeResponse) {
fmt.Printf("Downgrade enable success, cluster version %s", r.Version) fmt.Printf("Downgrade enable success, cluster version %s\n", r.Version)
} }
func (s *simplePrinter) DowngradeCancel(r v3.DowngradeResponse) { func (s *simplePrinter) DowngradeCancel(r v3.DowngradeResponse) {
fmt.Printf("Downgrade cancel success, cluster version %s", r.Version) fmt.Printf("Downgrade cancel success, cluster version %s\n", r.Version)
} }
func (s *simplePrinter) RoleAdd(role string, r v3.AuthRoleAddResponse) { func (s *simplePrinter) RoleAdd(role string, r v3.AuthRoleAddResponse) {

7
server/etcdserver/v3_server.go
View File

@ -23,6 +23,7 @@ import (
"time" "time"
pb "go.etcd.io/etcd/api/v3/etcdserverpb" pb "go.etcd.io/etcd/api/v3/etcdserverpb"
"go.etcd.io/etcd/api/v3/version"
"go.etcd.io/etcd/pkg/v3/traceutil" "go.etcd.io/etcd/pkg/v3/traceutil"
"go.etcd.io/etcd/raft/v3" "go.etcd.io/etcd/raft/v3"
"go.etcd.io/etcd/server/v3/auth" "go.etcd.io/etcd/server/v3/auth"
@ -922,7 +923,7 @@ func (s *EtcdServer) downgradeValidate(ctx context.Context, v string) (*pb.Downg
if cv == nil { if cv == nil {
return nil, ErrClusterVersionUnavailable return nil, ErrClusterVersionUnavailable
} }
resp.Version = cv.String() resp.Version = version.Cluster(cv.String())
err = s.Version().DowngradeValidate(ctx, targetVersion) err = s.Version().DowngradeValidate(ctx, targetVersion)
if err != nil { if err != nil {
return nil, err return nil, err
@ -943,7 +944,7 @@ func (s *EtcdServer) downgradeEnable(ctx context.Context, r *pb.DowngradeRequest
lg.Warn("reject downgrade request", zap.Error(err)) lg.Warn("reject downgrade request", zap.Error(err))
return nil, err return nil, err
} }
resp := pb.DowngradeResponse{Version: s.ClusterVersion().String()} resp := pb.DowngradeResponse{Version: version.Cluster(s.ClusterVersion().String())}
return &resp, nil return &resp, nil
} }
@ -952,6 +953,6 @@ func (s *EtcdServer) downgradeCancel(ctx context.Context) (*pb.DowngradeResponse
if err != nil { if err != nil {
s.lg.Warn("failed to cancel downgrade", zap.Error(err)) s.lg.Warn("failed to cancel downgrade", zap.Error(err))
} }
resp := pb.DowngradeResponse{Version: s.ClusterVersion().String()} resp := pb.DowngradeResponse{Version: version.Cluster(s.ClusterVersion().String())}
return &resp, nil return &resp, nil
} }