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: stricter checking in raftLog.slice

Browse Source
This commit is contained in:
Yicheng Qin 2014-11-25 00:05:00 -08:00
parent 1d01c8aa2d
commit 1e0f87df8c
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
raft/log.go
View File

@ -266,13 +266,15 @@ func (l *raftLog) slice(lo uint64, hi uint64) []pb.Entry {
if lo < l.unstable { if lo < l.unstable {
storedEnts, err := l.storage.Entries(lo, min(hi, l.unstable)) storedEnts, err := l.storage.Entries(lo, min(hi, l.unstable))
if err == ErrCompacted { if err == ErrCompacted {
// This should never fail because it has been checked before.
log.Panicf("entries[%d:%d) from storage is out of bound", lo, min(hi, l.unstable))
return nil return nil
} else if err != nil { } else if err != nil {
panic(err) // TODO(bdarnell) panic(err) // TODO(bdarnell)
} }
ents = append(ents, storedEnts...) ents = append(ents, storedEnts...)
} }
if len(l.unstableEnts) > 0 && hi > l.unstable { if hi > l.unstable {
firstUnstable := max(lo, l.unstable) firstUnstable := max(lo, l.unstable)
ents = append(ents, l.unstableEnts[firstUnstable-l.unstable:hi-l.unstable]...) ents = append(ents, l.unstableEnts[firstUnstable-l.unstable:hi-l.unstable]...)
} }