vitalif
/
etcd
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #9088 from nvanbenschoten/nvanbenschoten/leaner 

raft: s/leaner/learner/g
release-3.4
Xiang Li 2018-01-03 08:41:53 -08:00 committed by GitHub
parent 664f9bd5ba e6dc57f708
commit 17ce61bd0d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
raft/raft.go
View File

@ -116,8 +116,9 @@ type Config struct {
// used for testing right now.
peers []uint64
// learners contains the IDs of all leaner nodes (including self if the local node is a leaner) in the raft cluster.
// learners only receives entries from the leader node. It does not vote or promote itself.
// learners contains the IDs of all learner nodes (including self if the
// local node is a learner) in the raft cluster. learners only receives
// entries from the leader node. It does not vote or promote itself.
learners []uint64
// ElectionTick is the number of Node.Tick invocations that must pass between
@ -1277,7 +1278,7 @@ func (r *raft) addNodeOrLearnerNode(id uint64, isLearner bool) {
} else {
if isLearner && !pr.IsLearner {
// can only change Learner to Voter
r.logger.Infof("%x ignored addLeaner: do not support changing %x from raft peer to learner.", r.id, id)
r.logger.Infof("%x ignored addLearner: do not support changing %x from raft peer to learner.", r.id, id)
return
}

2
raft/raft_test.go
View File

@ -368,7 +368,7 @@ func TestLearnerElectionTimeout(t *testing.T) {
}
}
// TestLearnerPromotion verifies that the leaner should not election until
// TestLearnerPromotion verifies that the learner should not election until
// it is promoted to a normal peer.
func TestLearnerPromotion(t *testing.T) {
n1 := newTestLearnerRaft(1, []uint64{1}, []uint64{2}, 10, 1, NewMemoryStorage())