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.

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 setup order to avoid races #13871

Merged
merged 3 commits into from
Aug 29, 2023
Merged
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
5 changes: 4 additions & 1 deletion go/cmd/vttestserver/vttestserver_test.go
Original file line number Diff line number Diff line change
@@ -114,7 +114,10 @@ func TestPersistentMode(t *testing.T) {
// reboot the persistent cluster
cluster.TearDown()
cluster, err = startPersistentCluster(dir)
defer cluster.TearDown()
defer func() {
cluster.PersistentMode = false // Cleanup the tmpdir as we're done
cluster.TearDown()
}()
assert.NoError(t, err)

// rerun our sanity checks to make sure vschema is persisted correctly
24 changes: 0 additions & 24 deletions go/test/utils/noleak.go
Original file line number Diff line number Diff line change
@@ -18,16 +18,10 @@ package utils

import (
"context"
"os"
"os/exec"
"strconv"
"strings"
"testing"
"time"

"go.uber.org/goleak"

"vitess.io/vitess/go/vt/log"
)

// LeakCheckContext returns a Context that will be automatically cancelled at the end
@@ -73,9 +67,6 @@ func ensureNoLeaks() error {
if err := ensureNoGoroutines(); err != nil {
return err
}
if err := ensureNoOpenSockets(); err != nil {
return err
}
return nil
}

@@ -103,18 +94,3 @@ func ensureNoGoroutines() error {
}
return err
}

func ensureNoOpenSockets() error {
cmd := exec.Command("lsof", "-a", "-p", strconv.Itoa(os.Getpid()), "-i", "-P", "-V")
cmd.Stderr = nil
lsof, err := cmd.Output()
if err == nil {
log.Errorf("found open sockets:\n%s", lsof)
} else {
if strings.Contains(string(lsof), "no Internet files located") {
return nil
}
log.Errorf("failed to run `lsof`: %v (%q)", err, lsof)
}
return err
}
34 changes: 19 additions & 15 deletions go/vt/vtgate/executor_framework_test.go
Original file line number Diff line number Diff line change
@@ -132,8 +132,16 @@ func createExecutorEnv(t testing.TB) (executor *Executor, sbc1, sbc2, sbclookup
ctx, cancel = context.WithCancel(context.Background())
cell := "aa"
hc := discovery.NewFakeHealthCheck(make(chan *discovery.TabletHealth))

s := createSandbox(KsTestSharded)
s.VSchema = executorVSchema
sb := createSandbox(KsTestUnsharded)
sb.VSchema = unshardedVSchema
// Use the 'X' in the name to ensure it's not alphabetically first.
// Otherwise, it would become the default keyspace for the dual table.
bad := createSandbox("TestXBadSharding")
bad.VSchema = badVSchema

serv := newSandboxForCells(ctx, []string{cell})
serv.topoServer.CreateKeyspace(ctx, KsTestSharded, &topodatapb.Keyspace{SidecarDbName: sidecar.DefaultName})
// Force a new cache to use for lookups of the sidecar database identifier
@@ -152,6 +160,7 @@ func createExecutorEnv(t testing.TB) (executor *Executor, sbc1, sbc2, sbclookup
if !created {
log.Fatal("Failed to [re]create a sidecar database identifier cache!")
}

resolver := newTestResolver(ctx, hc, serv, cell)
sbc1 = hc.AddTestTablet(cell, "-20", 1, "TestExecutor", "-20", topodatapb.TabletType_PRIMARY, true, 1, nil)
sbc2 = hc.AddTestTablet(cell, "40-60", 1, "TestExecutor", "40-60", topodatapb.TabletType_PRIMARY, true, 1, nil)
@@ -164,16 +173,9 @@ func createExecutorEnv(t testing.TB) (executor *Executor, sbc1, sbc2, sbclookup
_ = hc.AddTestTablet(cell, "e0-", 1, "TestExecutor", "e0-", topodatapb.TabletType_PRIMARY, true, 1, nil)
// Below is needed so that SendAnyWherePlan doesn't fail

sb := createSandbox(KsTestUnsharded)
sbclookup = hc.AddTestTablet(cell, "0", 1, KsTestUnsharded, "0", topodatapb.TabletType_PRIMARY, true, 1, nil)
_ = hc.AddTestTablet(cell, "2", 3, KsTestUnsharded, "0", topodatapb.TabletType_REPLICA, true, 1, nil)

// Ues the 'X' in the name to ensure it's not alphabetically first.
// Otherwise, it would become the default keyspace for the dual table.
bad := createSandbox("TestXBadSharding")
bad.VSchema = badVSchema

sb.VSchema = unshardedVSchema
queryLogger := streamlog.New[*logstats.LogStats]("VTGate", queryLogBufferSize)
plans := cache.NewDefaultCacheImpl(cache.DefaultConfig)
executor = NewExecutor(ctx, serv, cell, resolver, false, false, testBufferSize, plans, nil, false, querypb.ExecuteOptions_Gen4, queryLogger)
@@ -194,16 +196,17 @@ func createCustomExecutor(t testing.TB, vschema string) (executor *Executor, sbc
ctx, cancel = context.WithCancel(context.Background())
cell := "aa"
hc := discovery.NewFakeHealthCheck(nil)

s := createSandbox(KsTestSharded)
s.VSchema = vschema
sb := createSandbox(KsTestUnsharded)
sb.VSchema = unshardedVSchema

serv := newSandboxForCells(ctx, []string{cell})
resolver := newTestResolver(ctx, hc, serv, cell)
sbc1 = hc.AddTestTablet(cell, "-20", 1, "TestExecutor", "-20", topodatapb.TabletType_PRIMARY, true, 1, nil)
sbc2 = hc.AddTestTablet(cell, "40-60", 1, "TestExecutor", "40-60", topodatapb.TabletType_PRIMARY, true, 1, nil)

sb := createSandbox(KsTestUnsharded)
sbc1 = hc.AddTestTablet(cell, "-20", 1, KsTestSharded, "-20", topodatapb.TabletType_PRIMARY, true, 1, nil)
sbc2 = hc.AddTestTablet(cell, "40-60", 1, KsTestSharded, "40-60", topodatapb.TabletType_PRIMARY, true, 1, nil)
sbclookup = hc.AddTestTablet(cell, "0", 1, KsTestUnsharded, "0", topodatapb.TabletType_PRIMARY, true, 1, nil)
sb.VSchema = unshardedVSchema

queryLogger := streamlog.New[*logstats.LogStats]("VTGate", queryLogBufferSize)
plans := cache.NewDefaultCacheImpl(cache.DefaultConfig)
@@ -223,8 +226,12 @@ func createCustomExecutorSetValues(t testing.TB, vschema string, values []*sqlty
ctx, cancel = context.WithCancel(context.Background())
cell := "aa"
hc := discovery.NewFakeHealthCheck(nil)

s := createSandbox(KsTestSharded)
s.VSchema = vschema
sb := createSandbox(KsTestUnsharded)
sb.VSchema = unshardedVSchema

serv := newSandboxForCells(ctx, []string{cell})
resolver := newTestResolver(ctx, hc, serv, cell)
shards := []string{"-20", "20-40", "40-60", "60-80", "80-a0", "a0-c0", "c0-e0", "e0-"}
@@ -236,10 +243,7 @@ func createCustomExecutorSetValues(t testing.TB, vschema string, values []*sqlty
}
sbcs = append(sbcs, sbc)
}

sb := createSandbox(KsTestUnsharded)
sbclookup = hc.AddTestTablet(cell, "0", 1, KsTestUnsharded, "0", topodatapb.TabletType_PRIMARY, true, 1, nil)
sb.VSchema = unshardedVSchema

queryLogger := streamlog.New[*logstats.LogStats]("VTGate", queryLogBufferSize)
plans := cache.NewDefaultCacheImpl(cache.DefaultConfig)
4 changes: 4 additions & 0 deletions go/vt/vtgate/schema/tracker.go
Original file line number Diff line number Diff line change
@@ -151,6 +151,10 @@ func (t *Tracker) Start() {
for {
select {
case th := <-t.ch:
if th == nil {
// channel closed
return
}
ksUpdater := t.getKeyspaceUpdateController(th)
ksUpdater.add(th)
case <-ctx.Done():