Browse Source

raft: rename makeP{RS,rogressTracker}

Tobias Schottdorf 6 years ago
parent
commit
0384c587eb
2 changed files with 3 additions and 3 deletions
  1. 1 1
      raft/progress.go
  2. 2 2
      raft/raft.go

+ 1 - 1
raft/progress.go

@@ -301,7 +301,7 @@ type progressTracker struct {
 	matchBuf    uint64Slice
 	matchBuf    uint64Slice
 }
 }
 
 
-func makePRS(maxInflight int) progressTracker {
+func makeProgressTracker(maxInflight int) progressTracker {
 	p := progressTracker{
 	p := progressTracker{
 		maxInflight: maxInflight,
 		maxInflight: maxInflight,
 		prs:         map[uint64]*Progress{},
 		prs:         map[uint64]*Progress{},

+ 2 - 2
raft/raft.go

@@ -343,7 +343,7 @@ func newRaft(c *Config) *raft {
 		raftLog:                   raftlog,
 		raftLog:                   raftlog,
 		maxMsgSize:                c.MaxSizePerMsg,
 		maxMsgSize:                c.MaxSizePerMsg,
 		maxUncommittedSize:        c.MaxUncommittedEntriesSize,
 		maxUncommittedSize:        c.MaxUncommittedEntriesSize,
-		prs:                       makePRS(c.MaxInflightMsgs),
+		prs:                       makeProgressTracker(c.MaxInflightMsgs),
 		electionTimeout:           c.ElectionTick,
 		electionTimeout:           c.ElectionTick,
 		heartbeatTimeout:          c.HeartbeatTick,
 		heartbeatTimeout:          c.HeartbeatTick,
 		logger:                    c.Logger,
 		logger:                    c.Logger,
@@ -1346,7 +1346,7 @@ func (r *raft) restore(s pb.Snapshot) bool {
 		r.id, r.raftLog.committed, r.raftLog.lastIndex(), r.raftLog.lastTerm(), s.Metadata.Index, s.Metadata.Term)
 		r.id, r.raftLog.committed, r.raftLog.lastIndex(), r.raftLog.lastTerm(), s.Metadata.Index, s.Metadata.Term)
 
 
 	r.raftLog.restore(s)
 	r.raftLog.restore(s)
-	r.prs = makePRS(r.prs.maxInflight)
+	r.prs = makeProgressTracker(r.prs.maxInflight)
 	r.restoreNode(s.Metadata.ConfState.Nodes, false)
 	r.restoreNode(s.Metadata.ConfState.Nodes, false)
 	r.restoreNode(s.Metadata.ConfState.Learners, true)
 	r.restoreNode(s.Metadata.ConfState.Learners, true)
 	return true
 	return true