From 2a1bae0c2af5a468b96439b1ec4010a96dade346 Mon Sep 17 00:00:00 2001 From: fanmin shi Date: Thu, 29 Dec 2016 11:27:16 -0800 Subject: [PATCH] etcdserver: consistent naming in raftReadyHandler --- etcdserver/raft.go | 2 +- etcdserver/server.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/etcdserver/raft.go b/etcdserver/raft.go index eae398cce..d7ec176eb 100644 --- a/etcdserver/raft.go +++ b/etcdserver/raft.go @@ -162,7 +162,7 @@ func (r *raftNode) start(rh *raftReadyHandler) { atomic.StoreUint64(&r.lead, rd.SoftState.Lead) islead = rd.RaftState == raft.StateLeader - rh.leadershipUpdate() + rh.updateLeadership() } if len(rd.ReadStates) != 0 { diff --git a/etcdserver/server.go b/etcdserver/server.go index d28908eee..f2ee1d787 100644 --- a/etcdserver/server.go +++ b/etcdserver/server.go @@ -598,7 +598,7 @@ type etcdProgress struct { // and helps decouple state machine logic from Raft algorithms. // TODO: add a state machine interface to apply the commit entries and do snapshot/recover type raftReadyHandler struct { - leadershipUpdate func() + updateLeadership func() updateCommittedIndex func(uint64) } @@ -624,7 +624,7 @@ func (s *EtcdServer) run() { return } rh := &raftReadyHandler{ - leadershipUpdate: func() { + updateLeadership: func() { if !s.isLeader() { if s.lessor != nil { s.lessor.Demote()