Skip to content

Commit 168a6be

Browse files
committed
Update apply workflow to process r.DowngradeVersionTest request
Signed-off-by: Benjamin Wang <benjamin.ahrtr@gmail.com>
1 parent 08effef commit 168a6be

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

server/etcdserver/apply/apply.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -447,6 +447,10 @@ func (a *applierMembership) DowngradeInfoSet(r *membershippb.DowngradeInfoSetReq
447447
a.cluster.SetDowngradeInfo(&d, shouldApplyV3)
448448
}
449449

450+
func (a *applierMembership) DowngradeVersionTest(r *membershippb.DowngradeVersionTest, shouldApplyV3 membership.ShouldApplyV3) {
451+
// do nothing
452+
}
453+
450454
type quotaApplierV3 struct {
451455
applierV3
452456
q serverstorage.Quota

server/etcdserver/server.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2006,7 +2006,7 @@ func (s *EtcdServer) applyEntryNormal(e *raftpb.Entry, shouldApplyV3 membership.
20062006
}
20072007

20082008
func (s *EtcdServer) applyInternalRaftRequest(r *pb.InternalRaftRequest, shouldApplyV3 membership.ShouldApplyV3) *apply.Result {
2009-
if r.ClusterVersionSet == nil && r.ClusterMemberAttrSet == nil && r.DowngradeInfoSet == nil {
2009+
if r.ClusterVersionSet == nil && r.ClusterMemberAttrSet == nil && r.DowngradeInfoSet == nil && r.DowngradeVersionTest == nil {
20102010
if !shouldApplyV3 {
20112011
return nil
20122012
}
@@ -2029,6 +2029,9 @@ func (s *EtcdServer) applyInternalRaftRequest(r *pb.InternalRaftRequest, shouldA
20292029
case r.DowngradeInfoSet != nil:
20302030
op = "DowngradeInfoSet" // Implemented in 3.5.x
20312031
membershipApplier.DowngradeInfoSet(r.DowngradeInfoSet, shouldApplyV3)
2032+
case r.DowngradeVersionTest != nil:
2033+
op = "DowngradeVersionTest"
2034+
membershipApplier.DowngradeVersionTest(r.DowngradeVersionTest, shouldApplyV3)
20322035
default:
20332036
s.lg.Panic("not implemented apply", zap.Stringer("raft-request", r))
20342037
return nil

0 commit comments

Comments
 (0)