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

raft: expose RecentActive in Progress

Browse Source
This commit is contained in:
Xiang Li 2015-12-10 12:17:18 -08:00
parent 9b26753dbf
commit 9df46f9d6f
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
raft/progress.go
View File

@ -59,7 +59,7 @@ type Progress struct {
// recentActive is true if the progress is recently active. Receiving any messages // recentActive is true if the progress is recently active. Receiving any messages
// from the corresponding follower indicates the progress is active. // from the corresponding follower indicates the progress is active.
// recentActive can be reset to false after an election timeout. // recentActive can be reset to false after an election timeout.
recentActive bool RecentActive bool
// inflights is a sliding window for the inflight messages. // inflights is a sliding window for the inflight messages.
// When inflights is full, no more message should be sent. // When inflights is full, no more message should be sent.
@ -73,7 +73,7 @@ type Progress struct {
func (pr *Progress) resetState(state ProgressStateType) { func (pr *Progress) resetState(state ProgressStateType) {
pr.Paused = false pr.Paused = false
pr.recentActive = false pr.RecentActive = false
pr.PendingSnapshot = 0 pr.PendingSnapshot = 0
pr.State = state pr.State = state
pr.ins.reset() pr.ins.reset()

8
raft/raft.go
View File

@ -600,7 +600,7 @@ func stepLeader(r *raft, m pb.Message) {
} }
switch m.Type { switch m.Type {
case pb.MsgAppResp: case pb.MsgAppResp:
pr.recentActive = true pr.RecentActive = true
if m.Reject { if m.Reject {
r.logger.Debugf("%x received msgApp rejection(lastindex: %d) from %x for index %d", r.logger.Debugf("%x received msgApp rejection(lastindex: %d) from %x for index %d",
@ -635,7 +635,7 @@ func stepLeader(r *raft, m pb.Message) {
} }
} }
case pb.MsgHeartbeatResp: case pb.MsgHeartbeatResp:
pr.recentActive = true pr.RecentActive = true
// free one slot for the full inflights window to allow progress. // free one slot for the full inflights window to allow progress.
if pr.State == ProgressStateReplicate && pr.ins.full() { if pr.State == ProgressStateReplicate && pr.ins.full() {
@ -867,11 +867,11 @@ func (r *raft) checkQuorumActive() bool {
continue continue
} }
if r.prs[id].recentActive { if r.prs[id].RecentActive {
act += 1 act += 1
} }
r.prs[id].recentActive = false r.prs[id].RecentActive = false
} }
return act >= r.q() return act >= r.q()