From c4b68963389f2303063efa0b60a243af0edb12f8 Mon Sep 17 00:00:00 2001 From: Blake Mizerany Date: Sat, 23 Aug 2014 17:52:16 -0700 Subject: [PATCH] raft: add/deleteIns -> add/delProgress --- raft2/raft.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/raft2/raft.go b/raft2/raft.go index b066e53af..f6e466b78 100644 --- a/raft2/raft.go +++ b/raft2/raft.go @@ -379,7 +379,7 @@ func (r *raft) handleSnapshot(m Message) { } func (r *raft) addNode(id int64) { - r.addIns(id, 0, r.raftLog.lastIndex()+1) + r.setProgress(id, 0, r.raftLog.lastIndex()+1) r.configuring = false if id == r.id { r.promotable = true @@ -387,7 +387,7 @@ func (r *raft) addNode(id int64) { } func (r *raft) removeNode(id int64) { - r.deleteIns(id) + r.delProgress(id) r.configuring = false } @@ -489,9 +489,9 @@ func (r *raft) restore(s Snapshot) bool { r.prs = make(map[int64]*progress) for _, n := range s.Nodes { if n == r.id { - r.addIns(n, r.raftLog.lastIndex(), r.raftLog.lastIndex()+1) + r.setProgress(n, r.raftLog.lastIndex(), r.raftLog.lastIndex()+1) } else { - r.addIns(n, 0, r.raftLog.lastIndex()+1) + r.setProgress(n, 0, r.raftLog.lastIndex()+1) } } r.configuring = false @@ -516,11 +516,11 @@ func (r *raft) nodes() []int64 { return nodes } -func (r *raft) addIns(id, match, next int64) { +func (r *raft) setProgress(id, match, next int64) { r.prs[id] = &progress{next: next, match: match} } -func (r *raft) deleteIns(id int64) { +func (r *raft) delProgress(id int64) { delete(r.prs, id) }