Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix flaky batching stage test #112

Merged
merged 1 commit into from
Mar 19, 2025
Merged

Fix flaky batching stage test #112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions reporter/pipeline/pipeline.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,8 +121,11 @@ func (w *BatchingStageWorker[In]) Start(ctx context.Context) {
defer w.wg.Done()
var batch []In
var tickerChan <-chan time.Time
var ticker clockwork.Ticker
if w.batchInterval > 0 {
tickerChan = w.clock.After(w.batchInterval)
ticker = w.clock.NewTicker(w.batchInterval)
tickerChan = ticker.Chan()
defer ticker.Stop()
}
for {
select {
Expand All @@ -137,18 +140,17 @@ func (w *BatchingStageWorker[In]) Start(ctx context.Context) {
}
batch = append(batch, input)
if w.batchSize > 0 && len(batch) >= w.batchSize {
if ticker != nil {
ticker.Reset(w.batchInterval)
}
w.outputChan <- batch
batch = nil
if w.batchInterval > 0 {
tickerChan = w.clock.After(w.batchInterval)
}
}
case <-tickerChan:
if len(batch) > 0 {
w.outputChan <- batch
batch = nil
}
tickerChan = w.clock.After(w.batchInterval)
}
}
}()
Expand Down
11 changes: 4 additions & 7 deletions reporter/pipeline/pipeline_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,17 +109,16 @@ func TestPipeline(t *testing.T) {
})

t.Run("PipelineWithBatchingStageWithInterval", func(t *testing.T) {
input := make(chan int, 1000)
for i := range 9 {
input <- i
}
input := make(chan int)
clock := clockwork.NewFakeClock()
stage1 := NewBatchingStageWithClock(input, 1*time.Second, 10, clock,
WithOutputChanSize(1))
p := NewPipeline(input, stage1)
output := stage1.GetOutputChannel()
p.Start(context.Background())
require.NoError(t, clock.BlockUntilContext(context.Background(), 1))
for i := range 9 {
input <- i
}
clock.Advance(1 * time.Second)
require.Len(t, <-output, 9)
clock.Advance(999 * time.Millisecond)
Expand All @@ -128,10 +127,8 @@ func TestPipeline(t *testing.T) {
}
require.Len(t, <-output, 10)
clock.Advance(1 * time.Millisecond)
require.NoError(t, clock.BlockUntilContext(context.Background(), 1))
require.Empty(t, output)
clock.Advance(999 * time.Millisecond)
require.NoError(t, clock.BlockUntilContext(context.Background(), 1))
require.Len(t, <-output, 5)
for i := range 5 {
input <- i
Expand Down