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: removedSlice -> removedNodes

Browse Source
This commit is contained in:
Xiang Li 2014-10-09 06:55:25 +08:00
parent 7b61565c0a
commit 73f2aaf98f
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
raft/raft.go
View File

@ -521,7 +521,7 @@ func (r *raft) compact(index int64, nodes []int64, d []byte) {
panic(fmt.Sprintf("raft: compact index (%d) exceeds applied index (%d)", index, r.raftLog.applied)) panic(fmt.Sprintf("raft: compact index (%d) exceeds applied index (%d)", index, r.raftLog.applied))
} }
// we might use a newer verison of removed list. It is OK. // we might use a newer verison of removed list. It is OK.
r.raftLog.snap(d, index, r.raftLog.term(index), nodes, r.removedSlice()) r.raftLog.snap(d, index, r.raftLog.term(index), nodes, r.removedNodes())
r.raftLog.compact(index) r.raftLog.compact(index)
} }
@ -566,7 +566,7 @@ func (r *raft) nodes() []int64 {
return nodes return nodes
} }
func (r *raft) removedSlice() []int64 { func (r *raft) removedNodes() []int64 {
removed := make([]int64, 0, len(r.removed)) removed := make([]int64, 0, len(r.removed))
for k := range r.removed { for k := range r.removed {
removed = append(removed, k) removed = append(removed, k)

2
raft/raft_test.go
View File

@ -914,7 +914,7 @@ func TestRestore(t *testing.T) {
t.Errorf("log.lastTerm = %d, want %d", sm.raftLog.term(s.Index), s.Term) t.Errorf("log.lastTerm = %d, want %d", sm.raftLog.term(s.Index), s.Term)
} }
sg := sm.nodes() sg := sm.nodes()
srn := sm.removedSlice() srn := sm.removedNodes()
sort.Sort(int64Slice(sg)) sort.Sort(int64Slice(sg))
sort.Sort(int64Slice(srn)) sort.Sort(int64Slice(srn))
if !reflect.DeepEqual(sg, s.Nodes) { if !reflect.DeepEqual(sg, s.Nodes) {