Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/unit_race.yml
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,6 @@ jobs:

- name: unit_race
if: steps.skip-workflow.outputs.skip-workflow == 'false' && steps.changes.outputs.unit_tests == 'true'
timeout-minutes: 30
timeout-minutes: 45
run: |
eatmydata -- make unit_test_race
4 changes: 4 additions & 0 deletions go/mysql/fakesqldb/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -616,11 +616,15 @@ func (db *DB) GetQueryCalledNum(query string) int {

// QueryLog returns the query log in a semicomma separated string
func (db *DB) QueryLog() string {
db.mu.Lock()
defer db.mu.Unlock()
return strings.Join(db.querylog, ";")
}

// ResetQueryLog resets the query log
func (db *DB) ResetQueryLog() {
db.mu.Lock()
defer db.mu.Unlock()
db.querylog = nil
}

Expand Down
4 changes: 3 additions & 1 deletion go/vt/vtctl/grpcvtctldserver/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -4255,7 +4255,9 @@ func (s *VtctldServer) ValidateVersionShard(ctx context.Context, req *vtctldatap
}

wg.Add(1)
go s.diffVersion(ctx, primaryVersion.Version, shard.PrimaryAlias, alias, &wg, &er)
go func(alias *topodatapb.TabletAlias) {
s.diffVersion(ctx, primaryVersion.Version, shard.PrimaryAlias, alias, &wg, &er)
}(alias)
}

wg.Wait()
Expand Down
2 changes: 1 addition & 1 deletion go/vt/vtctl/grpcvtctldserver/server_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -2707,7 +2707,7 @@ func TestDeleteShards(t *testing.T) {
defer func() {
topofactory.SetError(nil)

actualShards := []*vtctldatapb.Shard{}
var actualShards []*vtctldatapb.Shard

keyspaces, err := ts.GetKeyspaces(ctx)
require.NoError(t, err, "cannot get keyspace names to check remaining shards")
Expand Down