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

Merge pull request #1049 from unihorn/120

Browse Source 
raftLog: enhance check in compact
This commit is contained in:
Yicheng Qin 2014-09-12 11:35:41 -07:00
commit 072a21782e
2 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
raft/log.go
View File

@ -152,8 +152,8 @@ func (l *raftLog) maybeCommit(maxIndex, term int64) bool {
// and not greater than the index of the last entry. // and not greater than the index of the last entry.
// the number of entries after compaction will be returned. // the number of entries after compaction will be returned.
func (l *raftLog) compact(i int64) int64 { func (l *raftLog) compact(i int64) int64 {
if l.isOutOfBounds(i) { if l.isOutOfAppliedBounds(i) {
panic(fmt.Sprintf("compact %d out of bounds [%d:%d]", i, l.offset, l.lastIndex())) panic(fmt.Sprintf("compact %d out of bounds [%d:%d]", i, l.offset, l.applied))
} }
l.ents = l.slice(i, l.lastIndex()+1) l.ents = l.slice(i, l.lastIndex()+1)
l.unstable = max(i+1, l.unstable) l.unstable = max(i+1, l.unstable)
@ -208,6 +208,13 @@ func (l *raftLog) isOutOfBounds(i int64) bool {
return false return false
} }
func (l *raftLog) isOutOfAppliedBounds(i int64) bool {
if i < l.offset || i > l.applied {
return true
}
return false
}
func min(a, b int64) int64 { func min(a, b int64) int64 {
if a > b { if a > b {
return b return b

17
raft/log_test.go
View File

@ -76,11 +76,14 @@ func TestAppend(t *testing.T) {
func TestCompactionSideEffects(t *testing.T) { func TestCompactionSideEffects(t *testing.T) {
var i int64 var i int64
lastIndex := int64(1000) lastIndex := int64(1000)
lastTerm := lastIndex
raftLog := newLog() raftLog := newLog()
for i = 0; i < lastIndex; i++ { for i = 0; i < lastIndex; i++ {
raftLog.append(int64(i), pb.Entry{Term: int64(i + 1), Index: int64(i + 1)}) raftLog.append(int64(i), pb.Entry{Term: int64(i + 1), Index: int64(i + 1)})
} }
raftLog.maybeCommit(lastIndex, lastTerm)
raftLog.resetNextEnts()
raftLog.compact(500) raftLog.compact(500)
@ -149,16 +152,18 @@ func TestUnstableEnts(t *testing.T) {
//TestCompaction ensures that the number of log entreis is correct after compactions. //TestCompaction ensures that the number of log entreis is correct after compactions.
func TestCompaction(t *testing.T) { func TestCompaction(t *testing.T) {
tests := []struct { tests := []struct {
app int applied int64
lastIndex int64
compact []int64 compact []int64
wleft []int wleft []int
wallow bool wallow bool
}{ }{
// out of upper bound // out of upper bound
{1000, []int64{1001}, []int{-1}, false}, {1000, 1000, []int64{1001}, []int{-1}, false},
{1000, []int64{300, 500, 800, 900}, []int{701, 501, 201, 101}, true}, {1000, 1000, []int64{300, 500, 800, 900}, []int{701, 501, 201, 101}, true},
// out of lower bound // out of lower bound
{1000, []int64{300, 299}, []int{701, -1}, false}, {1000, 1000, []int64{300, 299}, []int{701, -1}, false},
{0, 1000, []int64{1}, []int{-1}, false},
} }
for i, tt := range tests { for i, tt := range tests {
@ -172,9 +177,11 @@ func TestCompaction(t *testing.T) {
}() }()
raftLog := newLog() raftLog := newLog()
for i := 0; i < tt.app; i++ { for i := int64(0); i < tt.lastIndex; i++ {
raftLog.append(int64(i), pb.Entry{}) raftLog.append(int64(i), pb.Entry{})
} }
raftLog.maybeCommit(tt.applied, 0)
raftLog.resetNextEnts()
for j := 0; j < len(tt.compact); j++ { for j := 0; j < len(tt.compact); j++ {
raftLog.compact(tt.compact[j]) raftLog.compact(tt.compact[j])