From 1a142fca58e7332a31e806f6d0b921a7b99ac497 Mon Sep 17 00:00:00 2001 From: Yahor Yuzefovich Date: Wed, 28 Sep 2022 17:10:27 -0700 Subject: [PATCH] roachtest: tighten boundaries of tpch_concurrency This should remove one iteration which should keep the test under the default 10 hour timeout. Release note: None --- pkg/cmd/roachtest/tests/tpch_concurrency.go | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/pkg/cmd/roachtest/tests/tpch_concurrency.go b/pkg/cmd/roachtest/tests/tpch_concurrency.go index 63346a1a1552..cc1d0cbe5dec 100644 --- a/pkg/cmd/roachtest/tests/tpch_concurrency.go +++ b/pkg/cmd/roachtest/tests/tpch_concurrency.go @@ -13,7 +13,6 @@ package tests import ( "context" "fmt" - "time" "github.com/cockroachdb/cockroach/pkg/cmd/roachtest/cluster" "github.com/cockroachdb/cockroach/pkg/cmd/roachtest/option" @@ -160,7 +159,7 @@ func registerTPCHConcurrency(r registry.Registry) { // additional step to ensure that some kind of lower bound for the // supported concurrency is always sustained and fail the test if it // isn't. - minConcurrency, maxConcurrency := 48, 160 + minConcurrency, maxConcurrency := 50, 110 // Run the binary search to find the largest concurrency that doesn't // crash a node in the cluster. The current range is represented by // [minConcurrency, maxConcurrency). @@ -193,12 +192,6 @@ func registerTPCHConcurrency(r registry.Registry) { Run: func(ctx context.Context, t test.Test, c cluster.Cluster) { runTPCHConcurrency(ctx, t, c, false /* disableStreamer */) }, - // By default, the timeout is 10 hours which might not be sufficient - // given that a single iteration of checkConcurrency might take on the - // order of an hour and a half, so in order to let each test run to - // complete, we'll give it 12 hours. Successful runs typically take - // less, around 8 hours. - Timeout: 12 * time.Hour, }) r.Add(registry.TestSpec{ @@ -208,11 +201,5 @@ func registerTPCHConcurrency(r registry.Registry) { Run: func(ctx context.Context, t test.Test, c cluster.Cluster) { runTPCHConcurrency(ctx, t, c, true /* disableStreamer */) }, - // By default, the timeout is 10 hours which might not be sufficient - // given that a single iteration of checkConcurrency might take on the - // order of an hour and a half, so in order to let each test run to - // complete, we'll give it 12 hours. Successful runs typically take - // less, around 8 hours. - Timeout: 12 * time.Hour, }) }