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: rename log.isOk to log.matchTerm

Browse Source
This commit is contained in:
Xiang Li 2014-05-27 22:47:13 -07:00 committed by Yicheng Qin
parent 4c609ec59c
commit 8f3d109c18
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
raft/log.go
View File

@ -20,7 +20,7 @@ func newLog() *log {
} }
func (l *log) maybeAppend(index, logTerm int, ents ...Entry) bool { func (l *log) maybeAppend(index, logTerm int, ents ...Entry) bool {
if l.isOk(index, logTerm) { if l.matchTerm(index, logTerm) {
l.append(index, ents...) l.append(index, ents...)
return true return true
} }
@ -58,7 +58,7 @@ func (l *log) isUpToDate(i, term int) bool {
return term > e.Term || (term == e.Term && i >= l.len()) return term > e.Term || (term == e.Term && i >= l.len())
} }
func (l *log) isOk(i, term int) bool { func (l *log) matchTerm(i, term int) bool {
if i > l.len() { if i > l.len() {
return false return false
} }

6
raft/raft.go
View File

@ -132,10 +132,6 @@ func (sm *stateMachine) poll(addr int, v bool) (granted int) {
return granted return granted
} }
func (sm *stateMachine) isLogOk(i, term int) bool {
return sm.log.isOk(i, term)
}
// send persists state to stable storage and then sends to its mailbox // send persists state to stable storage and then sends to its mailbox
func (sm *stateMachine) send(m Message) { func (sm *stateMachine) send(m Message) {
m.From = sm.addr m.From = sm.addr
@ -276,7 +272,7 @@ func (sm *stateMachine) Step(m Message) {
} }
handleAppendEntries := func() { handleAppendEntries := func() {
if sm.isLogOk(m.Index, m.LogTerm) { if sm.log.matchTerm(m.Index, m.LogTerm) {
sm.log.commit = m.Commit sm.log.commit = m.Commit
sm.log.append(m.Index, m.Entries...) sm.log.append(m.Index, m.Entries...)
sm.send(Message{To: m.From, Type: msgAppResp, Index: sm.li()}) sm.send(Message{To: m.From, Type: msgAppResp, Index: sm.li()})