From 23f29f3836a77d9f4bf9b49f014c59c0de58c4e0 Mon Sep 17 00:00:00 2001 From: Yahor Yuzefovich Date: Thu, 25 Apr 2024 01:03:00 +0000 Subject: [PATCH] kvstreamer: speed up TestStreamerVaryingResponseSizes We just saw a test timeout due to BatchBytesLimit randomization, so this commit disables batch randomizations for `TestStreamerVaryingResponseSizes`. Release note: None --- pkg/kv/kvclient/kvstreamer/BUILD.bazel | 1 + pkg/kv/kvclient/kvstreamer/streamer_test.go | 11 ++++++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/pkg/kv/kvclient/kvstreamer/BUILD.bazel b/pkg/kv/kvclient/kvstreamer/BUILD.bazel index cdc9b1b834eb..2c46e9b9dd10 100644 --- a/pkg/kv/kvclient/kvstreamer/BUILD.bazel +++ b/pkg/kv/kvclient/kvstreamer/BUILD.bazel @@ -70,6 +70,7 @@ go_test( "//pkg/settings/cluster", "//pkg/sql", "//pkg/sql/rowcontainer", + "//pkg/sql/sem/eval", "//pkg/storage", "//pkg/testutils/serverutils", "//pkg/testutils/skip", diff --git a/pkg/kv/kvclient/kvstreamer/streamer_test.go b/pkg/kv/kvclient/kvstreamer/streamer_test.go index 3f22e68c3603..1462c8d4e292 100644 --- a/pkg/kv/kvclient/kvstreamer/streamer_test.go +++ b/pkg/kv/kvclient/kvstreamer/streamer_test.go @@ -30,6 +30,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/kv/kvserver/concurrency/lock" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/settings/cluster" + "github.com/cockroachdb/cockroach/pkg/sql/sem/eval" "github.com/cockroachdb/cockroach/pkg/testutils/serverutils" "github.com/cockroachdb/cockroach/pkg/testutils/skip" "github.com/cockroachdb/cockroach/pkg/testutils/sqlutils" @@ -554,7 +555,15 @@ func TestStreamerVaryingResponseSizes(t *testing.T) { skip.UnderDuress(t) - s, db, _ := serverutils.StartServer(t, base.TestServerArgs{}) + s, db, _ := serverutils.StartServer(t, base.TestServerArgs{ + Knobs: base.TestingKnobs{ + SQLEvalContext: &eval.TestingKnobs{ + // We disable the randomization of some batch sizes because with + // some low values the test takes much longer. + ForceProductionValues: true, + }, + }, + }) defer s.Stopper().Stop(context.Background()) runner := sqlutils.MakeSQLRunner(db)