Merge #102013

102013: sql: fix race timeouts in TestCopyLarge r=cucaroach a=cucaroach This test was only inserted 10k rows but under certains metamorphic combinations this could be really slow. Lower to 100 and skip under race. Epic: none Release note: none Fixes: #102010 Co-authored-by: Tommy Reilly <[email protected]>
cockroachdb · May 3, 2023 · 9e0b06b · 9e0b06b
2 parents f3ec037 + 9d561e9
commit 9e0b06b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/pkg/sql/copy/BUILD.bazel b/pkg/sql/copy/BUILD.bazel
@@ -32,6 +32,7 @@ go_test(
         "//pkg/testutils",
         "//pkg/testutils/datapathutils",
         "//pkg/testutils/serverutils",
+        "//pkg/testutils/skip",
         "//pkg/testutils/sqlutils",
         "//pkg/testutils/testcluster",
         "//pkg/util/ctxgroup",

diff --git a/pkg/sql/copy/copy_test.go b/pkg/sql/copy/copy_test.go
@@ -40,6 +40,7 @@ import (
 	"github.com/cockroachdb/cockroach/pkg/testutils"
 	"github.com/cockroachdb/cockroach/pkg/testutils/datapathutils"
 	"github.com/cockroachdb/cockroach/pkg/testutils/serverutils"
+	"github.com/cockroachdb/cockroach/pkg/testutils/skip"
 	"github.com/cockroachdb/cockroach/pkg/testutils/sqlutils"
 	"github.com/cockroachdb/cockroach/pkg/util/ctxgroup"
 	"github.com/cockroachdb/cockroach/pkg/util/encoding"
@@ -653,6 +654,8 @@ const lineitemSchemaMunged string = `CREATE TABLE lineitem (
 func TestLargeCopy(t *testing.T) {
 	defer leaktest.AfterTest(t)()
 	defer log.Scope(t).Close(t)
+	// This test can cause timeouts.
+	skip.UnderRace(t)
 	ctx := context.Background()
 
 	s, _, kvdb := serverutils.StartServer(t, base.TestServerArgs{})
@@ -673,7 +676,7 @@ func TestLargeCopy(t *testing.T) {
 	require.NoError(t, err)
 
 	rng := rand.New(rand.NewSource(0))
-	rows := 10000
+	rows := 100
 	numrows, err := conn.GetDriverConn().CopyFrom(ctx,
 		&copyReader{rng: rng, cols: desc.PublicColumns(), rows: rows},
 		"COPY lineitem FROM STDIN WITH CSV;")