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: copy ents to avoid races

Browse Source
This commit is contained in:
Blake Mizerany 2014-08-22 15:08:13 -07:00 committed by Yicheng Qin
parent 71ed92b6bd
commit 6e6d81f094
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
raft2/log.go
View File

@ -85,7 +85,13 @@ func (l *raftLog) findConflict(from int64, ents []Entry) int64 {
}
func (l *raftLog) unstableEnts() []Entry {
return l.entries(l.unstable)
ents := l.entries(l.unstable)
if ents == nil {
return nil
}
cpy := make([]Entry, len(ents))
copy(cpy, ents)
return cpy
}
func (l *raftLog) resetUnstable() {
@ -96,7 +102,13 @@ func (l *raftLog) resetUnstable() {
// all the returned entries will be marked as applied.
func (l *raftLog) nextEnts() (ents []Entry) {
if l.committed > l.applied {
return l.slice(l.applied+1, l.committed+1)
ents := l.slice(l.applied+1, l.committed+1)
if ents == nil {
return nil
}
cpy := make([]Entry, len(ents))
copy(cpy, ents)
return cpy
}
return nil
}