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: clean up panic in log.go

Browse Source
This commit is contained in:
Xiang Li 2014-11-24 09:01:25 -08:00
parent f3cef87c69
commit bc0e72acb9
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
raft/log.go
View File

@ -46,7 +46,7 @@ type raftLog struct {
func newLog(storage Storage) *raftLog { func newLog(storage Storage) *raftLog {
if storage == nil { if storage == nil {
panic("storage must not be nil") log.Panic("storage must not be nil")
} }
log := &raftLog{ log := &raftLog{
storage: storage, storage: storage,
@ -93,7 +93,7 @@ func (l *raftLog) maybeAppend(index, logTerm, committed uint64, ents ...pb.Entry
func (l *raftLog) append(after uint64, ents ...pb.Entry) uint64 { func (l *raftLog) append(after uint64, ents ...pb.Entry) uint64 {
if after < l.committed { if after < l.committed {
log.Panicf("appending after %d, but already committed through %d", after, l.committed) log.Panicf("after(%d) out of range [committed(%d)]", after, l.committed)
} }
if after < l.unstable { if after < l.unstable {
// The log is being truncated to before our current unstable // The log is being truncated to before our current unstable
@ -170,7 +170,7 @@ func (l *raftLog) commitTo(tocommit uint64) {
// never decrease commit // never decrease commit
if l.committed < tocommit { if l.committed < tocommit {
if l.lastIndex() < tocommit { if l.lastIndex() < tocommit {
panic("committed out of range") log.Panicf("tocommit(%d) is out of range [lastIndex(%d)]", tocommit, l.lastIndex())
} }
l.committed = tocommit l.committed = tocommit
} }
@ -181,14 +181,14 @@ func (l *raftLog) appliedTo(i uint64) {
return return
} }
if l.committed < i || i < l.applied { if l.committed < i || i < l.applied {
log.Panicf("applied[%d] is out of range [prevApplied(%d), committed(%d)]", i, l.applied, l.committed) log.Panicf("applied(%d) is out of range [prevApplied(%d), committed(%d)]", i, l.applied, l.committed)
} }
l.applied = i l.applied = i
} }
func (l *raftLog) stableTo(i uint64) { func (l *raftLog) stableTo(i uint64) {
if i < l.unstable || i+1-l.unstable > uint64(len(l.unstableEnts)) { if i < l.unstable || i+1-l.unstable > uint64(len(l.unstableEnts)) {
log.Panicf("stableTo(%d) is out of range (unstable=%d, len(unstableEnts)=%d)", log.Panicf("stableTo(%d) is out of range [unstable(%d), len(unstableEnts)(%d)]",
i, l.unstable, len(l.unstableEnts)) i, l.unstable, len(l.unstableEnts))
} }
l.unstableEnts = l.unstableEnts[i+1-l.unstable:] l.unstableEnts = l.unstableEnts[i+1-l.unstable:]