Merge pull request #10807 from tbg/extract-prs

raft: extract 'tracker' package
etcd-io · Jun 21, 2019 · 948e276 · 948e276
2 parents 6953ccc + f9c2d00
commit 948e276
Show file tree

Hide file tree

Showing 17 changed files with 1,065 additions and 919 deletions.
diff --git a/etcdserver/raft.go b/etcdserver/raft.go
@@ -34,7 +34,6 @@ import (
 	"go.etcd.io/etcd/raft/raftpb"
 	"go.etcd.io/etcd/wal"
 	"go.etcd.io/etcd/wal/walpb"
-
 	"go.uber.org/zap"
 )
 

diff --git a/raft/node.go b/raft/node.go
@@ -353,15 +353,15 @@ func (n *node) run(r *raft) {
 			}
 		case m := <-n.recvc:
 			// filter out response message from unknown From.
-			if pr := r.prs.getProgress(m.From); pr != nil || !IsResponseMsg(m.Type) {
+			if pr := r.prs.Progress[m.From]; pr != nil || !IsResponseMsg(m.Type) {
 				r.Step(m)
 			}
 		case cc := <-n.confc:
 			if cc.NodeID == None {
 				select {
 				case n.confstatec <- pb.ConfState{
-					Nodes:    r.prs.voterNodes(),
-					Learners: r.prs.learnerNodes()}:
+					Nodes:    r.prs.VoterNodes(),
+					Learners: r.prs.LearnerNodes()}:
 				case <-n.done:
 				}
 				break
@@ -384,8 +384,8 @@ func (n *node) run(r *raft) {
 			}
 			select {
 			case n.confstatec <- pb.ConfState{
-				Nodes:    r.prs.voterNodes(),
-				Learners: r.prs.learnerNodes()}:
+				Nodes:    r.prs.VoterNodes(),
+				Learners: r.prs.LearnerNodes()}:
 			case <-n.done:
 			}
 		case <-n.tickc: