From 509cf414f751b04e6f01092351a3d99aa385b4aa Mon Sep 17 00:00:00 2001 From: Gyuho Lee Date: Thu, 15 Mar 2018 19:35:44 -0400 Subject: [PATCH] etcdserver: remove duplicate "setAppliedIndex" calls Signed-off-by: Gyuho Lee --- etcdserver/api/v3rpc/maintenance.go | 2 +- etcdserver/server.go | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/etcdserver/api/v3rpc/maintenance.go b/etcdserver/api/v3rpc/maintenance.go index da4e9d69d..4f2e5305b 100644 --- a/etcdserver/api/v3rpc/maintenance.go +++ b/etcdserver/api/v3rpc/maintenance.go @@ -155,8 +155,8 @@ func (ms *maintenanceServer) Status(ctx context.Context, ar *pb.StatusRequest) ( DbSize: ms.bg.Backend().Size(), Leader: uint64(ms.rg.Leader()), RaftIndex: ms.rg.CommittedIndex(), - RaftTerm: ms.rg.Term(), RaftAppliedIndex: ms.rg.AppliedIndex(), + RaftTerm: ms.rg.Term(), DbSizeInUse: ms.bg.Backend().SizeInUse(), } if uint64(ms.rg.Leader()) == raft.None { diff --git a/etcdserver/server.go b/etcdserver/server.go index f37a3cf2e..5a2746726 100644 --- a/etcdserver/server.go +++ b/etcdserver/server.go @@ -1392,6 +1392,8 @@ func (s *EtcdServer) apply(es []raftpb.Entry, confState *raftpb.ConfState) (appl switch e.Type { case raftpb.EntryNormal: s.applyEntryNormal(&e) + s.setAppliedIndex(e.Index) + s.setTerm(e.Term) case raftpb.EntryConfChange: // set the consistent index of current executing entry if e.Index > s.consistIndex.ConsistentIndex() { @@ -1401,15 +1403,13 @@ func (s *EtcdServer) apply(es []raftpb.Entry, confState *raftpb.ConfState) (appl pbutil.MustUnmarshal(&cc, e.Data) removedSelf, err := s.applyConfChange(cc, confState) s.setAppliedIndex(e.Index) + s.setTerm(e.Term) shouldStop = shouldStop || removedSelf s.w.Trigger(cc.ID, &confChangeResponse{s.cluster.Members(), err}) default: plog.Panicf("entry type should be either EntryNormal or EntryConfChange") } - atomic.StoreUint64(&s.appliedIndex, e.Index) - atomic.StoreUint64(&s.term, e.Term) - appliedt = e.Term - appliedi = e.Index + appliedi, appliedt = e.Index, e.Term } return appliedt, appliedi, shouldStop } @@ -1422,7 +1422,6 @@ func (s *EtcdServer) applyEntryNormal(e *raftpb.Entry) { s.consistIndex.setConsistentIndex(e.Index) shouldApplyV3 = true } - defer s.setAppliedIndex(e.Index) // raft state machine may generate noop entry when leader confirmation. // skip it in advance to avoid some potential bug in the future