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

Jump to bottom

tabletserver: fix flaky test #7851

Merged
merged 2 commits into from
Apr 15, 2021
Merged

tabletserver: fix flaky test #7851

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2c204cd
tabletserver: fix flaky test
vmg Apr 13, 2021
37a2a5c
tabletserver: more resilient tests
vmg Apr 13, 2021
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
31 changes: 20 additions & 11 deletions go/vt/vttablet/tabletserver/stream_consolidator_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import (
"context"
"fmt"
"sync"
"sync/atomic"
"testing"
"time"

Expand All @@ -36,6 +37,7 @@ type consolidationResult struct {
err error
items []*sqltypes.Result
duration time.Duration
count int64
}

func nocleanup(_ *sqltypes.Result) error {
Expand Down Expand Up @@ -97,6 +99,15 @@ func (ct *consolidationTest) leader(stream StreamCallback) error {
return nil
}

func (ct *consolidationTest) waitForResults(worker int, count int64) {
for {
if atomic.LoadInt64(&ct.results[worker].count) > count {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just making sure you intended for > and not >=?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ayup, it needs to wait until we have received more than the expected amount of results.

return
}
time.Sleep(1 * time.Millisecond)
}
}

func (ct *consolidationTest) run(workers int, generateCallback func(int) (string, StreamCallback)) {
if ct.results == nil {
ct.results = make([]*consolidationResult, workers)
Expand All @@ -118,6 +129,7 @@ func (ct *consolidationTest) run(workers int, generateCallback func(int) (string
err := ct.cc.Consolidate(logStats, query, func(result *sqltypes.Result) error {
cr := ct.results[worker]
cr.items = append(cr.items, result)
atomic.AddInt64(&cr.count, 1)
return callback(result)
}, ct.leader)

Expand Down Expand Up @@ -333,22 +345,21 @@ func TestConsolidatorMemoryLimits(t *testing.T) {
})

t.Run("two-phase consolidation (memory)", func(t *testing.T) {
const streamsInFirstBatch = 5
results := generateResultSizes(100, 10)
rsize := results[0].CachedSize(true)

ct := consolidationTest{
cc: NewStreamConsolidator(128*1024, rsize*5+1, nocleanup),
cc: NewStreamConsolidator(128*1024, rsize*streamsInFirstBatch+1, nocleanup),
streamItemDelay: 1 * time.Millisecond,
streamItems: results,
}

ct.run(10, func(worker int) (string, StreamCallback) {
if worker > 4 {
time.Sleep(6 * time.Millisecond)
}
return "select 1", func(_ *sqltypes.Result) error {
return nil
ct.waitForResults(0, streamsInFirstBatch)
}
return "select 1", func(_ *sqltypes.Result) error { return nil }
})

require.Equal(t, 2, ct.leaderCalls)
Expand All @@ -373,15 +384,13 @@ func TestConsolidatorMemoryLimits(t *testing.T) {
switch {
case worker >= 0 && worker <= 4:
case worker >= 5 && worker <= 9:
time.Sleep(21 * time.Millisecond)
ct.waitForResults(0, 2)
case worker >= 10 && worker <= 14:
time.Sleep(42 * time.Millisecond)
ct.waitForResults(5, 2)
case worker >= 15 && worker <= 19:
time.Sleep(63 * time.Millisecond)
}
return "select 1", func(_ *sqltypes.Result) error {
return nil
ct.waitForResults(10, 2)
}
return "select 1", func(_ *sqltypes.Result) error { return nil }
})

require.Equal(t, 4, ct.leaderCalls)
Expand Down