vitalif
/
etcd
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #5978 from heyitsanthony/fix-compactor 

compactor: make event ordering well-defined in TestPeriodicPause
release-3.1
Anthony Romano 2016-07-18 20:06:57 -07:00 committed by GitHub
parent a61862acc7 a1d823c2aa
commit d914502090
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
compactor/compactor_test.go
View File

@ -70,11 +70,13 @@ func TestPeriodicPause(t *testing.T) {
tb.Run()
tb.Pause()
// tb will collect 3 hours of revisions but not compact since paused
n := int(time.Hour / checkCompactionInterval)
for i := 0; i < 3*n; i++ {
rg.Wait(1)
fc.Advance(checkCompactionInterval)
rg.Wait(1)
}
// tb ends up waiting for the clock
select {
case a := <-compactable.Chan():
@ -82,16 +84,19 @@ func TestPeriodicPause(t *testing.T) {
case <-time.After(10 * time.Millisecond):
}
// tb resumes to being blocked on the clock
tb.Resume()
rg.Wait(1)
fc.Advance(checkCompactionInterval)
// unblock clock, will kick off a compaction at hour 3
fc.Advance(checkCompactionInterval)
a, err := compactable.Wait(1)
if err != nil {
t.Fatal(err)
}
if !reflect.DeepEqual(a[0].Params[0], &pb.CompactionRequest{Revision: int64(2*n) + 2}) {
t.Errorf("compact request = %v, want %v", a[0].Params[0], &pb.CompactionRequest{Revision: int64(2*n) + 2})
// compact the revision from hour 2
wreq := &pb.CompactionRequest{Revision: int64(2*n + 1)}
if !reflect.DeepEqual(a[0].Params[0], wreq) {
t.Errorf("compact request = %v, want %v", a[0].Params[0], wreq.Revision)
}
}