Skip to content

Commit

Permalink
importer: skip all 3 node tests under race
Browse files Browse the repository at this point in the history
This commit is the continuation of
fbbb071 so that we now skip all 3 node
import tests under race (when run with multi-tenancy, these are prone to
overload).

Release note: None
  • Loading branch information
yuzefovich committed Jan 8, 2025
1 parent 7a0da84 commit 0d2aef2
Showing 1 changed file with 33 additions and 31 deletions.
64 changes: 33 additions & 31 deletions pkg/sql/importer/import_stmt_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -2019,6 +2019,8 @@ func TestFailedImportGC(t *testing.T) {
defer leaktest.AfterTest(t)()
defer log.Scope(t).Close(t)

skip.UnderRace(t)

const nodes = 3

var forceFailure bool
Expand Down Expand Up @@ -2759,6 +2761,9 @@ INSERT INTO foo VALUES (1);
func TestImportObjectLevelRBAC(t *testing.T) {
defer leaktest.AfterTest(t)()
defer log.Scope(t).Close(t)

skip.UnderRace(t)

const nodes = 3

ctx := context.Background()
Expand Down Expand Up @@ -3838,9 +3843,7 @@ func TestImportIntoCSV(t *testing.T) {

func benchUserUpload(b *testing.B, uploadBaseURI string) {
defer log.Scope(b).Close(b)
const (
nodes = 3
)
const nodes = 3
ctx := context.Background()
baseDir, cleanup := testutils.TempDir(b)
defer cleanup()
Expand Down Expand Up @@ -4109,6 +4112,7 @@ func TestImportDefault(t *testing.T) {
defer log.Scope(t).Close(t)

skip.UnderRace(t, "takes >1min under race")

const nodes = 3
numFiles := nodes + 2
rowsPerFile := 1000
Expand Down Expand Up @@ -4534,6 +4538,7 @@ func TestImportDefaultNextVal(t *testing.T) {
defer leaktest.AfterTest(t)()
defer log.Scope(t).Close(t)
defer setImportReaderParallelism(1)()

skip.UnderRace(t, "test hits a timeout before a successful run")

const nodes = 3
Expand Down Expand Up @@ -5420,9 +5425,7 @@ func TestImportMysql(t *testing.T) {

skip.UnderRace(t)

const (
nodes = 3
)
const nodes = 3
ctx := context.Background()
baseDir := datapathutils.TestDataPath(t)
args := base.TestServerArgs{ExternalIODir: baseDir}
Expand Down Expand Up @@ -5550,9 +5553,9 @@ func TestImportIntoMysql(t *testing.T) {
defer leaktest.AfterTest(t)()
defer log.Scope(t).Close(t)

const (
nodes = 3
)
skip.UnderRace(t)

const nodes = 3
ctx := context.Background()
baseDir := datapathutils.TestDataPath(t)
args := base.TestServerArgs{ExternalIODir: baseDir}
Expand All @@ -5577,9 +5580,9 @@ func TestImportDelimited(t *testing.T) {
defer leaktest.AfterTest(t)()
defer log.Scope(t).Close(t)

const (
nodes = 3
)
skip.UnderRace(t)

const nodes = 3
ctx := context.Background()
baseDir := datapathutils.TestDataPath(t, "mysqlout")
args := base.TestServerArgs{ExternalIODir: baseDir}
Expand Down Expand Up @@ -5667,9 +5670,9 @@ func TestImportPgCopy(t *testing.T) {
defer leaktest.AfterTest(t)()
defer log.Scope(t).Close(t)

const (
nodes = 3
)
skip.UnderRace(t)

const nodes = 3
ctx := context.Background()
baseDir := datapathutils.TestDataPath(t, "pgcopy")
args := base.TestServerArgs{ExternalIODir: baseDir}
Expand Down Expand Up @@ -5753,9 +5756,9 @@ func TestImportPgDump(t *testing.T) {
defer leaktest.AfterTest(t)()
defer log.Scope(t).Close(t)

const (
nodes = 3
)
skip.UnderRace(t)

const nodes = 3
ctx := context.Background()
baseDir := datapathutils.TestDataPath(t)
args := base.TestServerArgs{ExternalIODir: baseDir}
Expand Down Expand Up @@ -6504,9 +6507,9 @@ func TestImportCockroachDump(t *testing.T) {
defer leaktest.AfterTest(t)()
defer log.Scope(t).Close(t)

const (
nodes = 3
)
skip.UnderRace(t)

const nodes = 3
ctx := context.Background()
baseDir := datapathutils.TestDataPath(t)
args := base.TestServerArgs{ExternalIODir: baseDir}
Expand Down Expand Up @@ -6603,9 +6606,9 @@ func TestImportAvro(t *testing.T) {
defer leaktest.AfterTest(t)()
defer log.Scope(t).Close(t)

const (
nodes = 3
)
skip.UnderRace(t)

const nodes = 3
ctx := context.Background()
baseDir := datapathutils.TestDataPath(t, "avro")
args := base.TestServerArgs{ExternalIODir: baseDir}
Expand Down Expand Up @@ -6930,9 +6933,9 @@ func TestDetachedImport(t *testing.T) {
defer leaktest.AfterTest(t)()
defer log.Scope(t).Close(t)

const (
nodes = 3
)
skip.UnderRace(t)

const nodes = 3
ctx := context.Background()
baseDir := datapathutils.TestDataPath(t, "avro")
args := base.TestServerArgs{ExternalIODir: baseDir}
Expand Down Expand Up @@ -7030,12 +7033,11 @@ func TestImportRowErrorLargeRows(t *testing.T) {
func TestImportJobEventLogging(t *testing.T) {
defer leaktest.AfterTest(t)()
defer log.ScopeWithoutShowLogs(t).Close(t)

defer jobs.TestingSetProgressThresholds()()

const (
nodes = 3
)
skip.UnderRace(t)

const nodes = 3
ctx := context.Background()
baseDir := datapathutils.TestDataPath(t, "avro")
args := base.TestServerArgs{ExternalIODir: baseDir}
Expand Down

0 comments on commit 0d2aef2

Please sign in to comment.