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

CI: Address data race in TestSchemaVersioning #15998

Merged
merged 1 commit into from
May 23, 2024
Merged

CI: Address data race in TestSchemaVersioning #15998

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
11 changes: 11 additions & 0 deletions go/vt/vttablet/endtoend/vstreamer_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import (
"errors"
"fmt"
"strings"
"sync"
"testing"
"time"

Expand Down Expand Up @@ -65,6 +66,7 @@ func TestSchemaVersioning(t *testing.T) {

ctx, cancel := context.WithCancel(context.Background())
defer cancel()
wg := sync.WaitGroup{}
tsv.EnableHistorian(true)
tsv.SetTracking(true)
time.Sleep(100 * time.Millisecond) // wait for _vt tables to be created
Expand Down Expand Up @@ -155,7 +157,9 @@ func TestSchemaVersioning(t *testing.T) {
}
return nil
}
wg.Add(1)
go func() {
defer wg.Done()
defer close(eventCh)
req := &binlogdatapb.VStreamRequest{Target: target, Position: "current", TableLastPKs: nil, Filter: filter}
if err := tsv.VStream(ctx, req, send); err != nil {
Expand Down Expand Up @@ -186,6 +190,7 @@ func TestSchemaVersioning(t *testing.T) {
}
runCases(ctx, t, cases, eventCh)
cancel()
wg.Wait()

log.Infof("\n\n\n=============================================== PAST EVENTS WITH TRACK VERSIONS START HERE ======================\n\n\n")
ctx, cancel = context.WithCancel(context.Background())
Expand Down Expand Up @@ -214,7 +219,9 @@ func TestSchemaVersioning(t *testing.T) {
}
return nil
}
wg.Add(1)
go func() {
defer wg.Done()
defer close(eventCh)
req := &binlogdatapb.VStreamRequest{Target: target, Position: startPos, TableLastPKs: nil, Filter: filter}
if err := tsv.VStream(ctx, req, send); err != nil {
Expand Down Expand Up @@ -257,6 +264,7 @@ func TestSchemaVersioning(t *testing.T) {
expectLogs(ctx, t, "Past stream", eventCh, output)

cancel()
wg.Wait()

log.Infof("\n\n\n=============================================== PAST EVENTS WITHOUT TRACK VERSIONS START HERE ======================\n\n\n")
tsv.EnableHistorian(false)
Expand Down Expand Up @@ -286,7 +294,9 @@ func TestSchemaVersioning(t *testing.T) {
}
return nil
}
wg.Add(1)
go func() {
defer wg.Done()
defer close(eventCh)
req := &binlogdatapb.VStreamRequest{Target: target, Position: startPos, TableLastPKs: nil, Filter: filter}
if err := tsv.VStream(ctx, req, send); err != nil {
Expand Down Expand Up @@ -331,6 +341,7 @@ func TestSchemaVersioning(t *testing.T) {

expectLogs(ctx, t, "Past stream", eventCh, output)
cancel()
wg.Wait()

client := framework.NewClient()
client.Execute("drop table vitess_version", nil)
Expand Down
Loading