Browse Source

raft: removedSlice -> removedNodes

Xiang Li 11 years ago
parent
commit
73f2aaf98f
2 changed files with 3 additions and 3 deletions
  1. 2 2
      raft/raft.go
  2. 1 1
      raft/raft_test.go

+ 2 - 2
raft/raft.go

@@ -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))
 	}
 	// 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)
 }
 
@@ -566,7 +566,7 @@ func (r *raft) nodes() []int64 {
 	return nodes
 }
 
-func (r *raft) removedSlice() []int64 {
+func (r *raft) removedNodes() []int64 {
 	removed := make([]int64, 0, len(r.removed))
 	for k := range r.removed {
 		removed = append(removed, k)

+ 1 - 1
raft/raft_test.go

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