From 0d6c1dbb12e2759ac4bca5f7d5170c2dc24197ae Mon Sep 17 00:00:00 2001 From: Renato Costa Date: Mon, 10 Apr 2023 09:43:32 -0400 Subject: [PATCH] roachtest: bump tpccbench timeout Looking at the test history, we see that tpccbench may sometimes take longer than 5h, especially in multi-region setups. For that reason, we bump the timeout for this test to 7h, which should be sufficient and avoid failures due to timeouts. This commit also removes an unused `MinVersion` field in the `tpccBenchSpec` struct. Resolves #100975. Release note: None --- pkg/cmd/roachtest/tests/tpcc.go | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/pkg/cmd/roachtest/tests/tpcc.go b/pkg/cmd/roachtest/tests/tpcc.go index 6918b69d8ee5..39b1ed6fafb7 100644 --- a/pkg/cmd/roachtest/tests/tpcc.go +++ b/pkg/cmd/roachtest/tests/tpcc.go @@ -979,8 +979,6 @@ type tpccBenchSpec struct { // change (i.e. CockroachDB gets faster!). EstimatedMax int - // MinVersion to pass to testRegistryImpl.Add. - MinVersion string // Tags to pass to testRegistryImpl.Add. Tags map[string]struct{} // EncryptionEnabled determines if the benchmark uses encrypted stores (i.e. @@ -1068,16 +1066,11 @@ func registerTPCCBenchSpec(r registry.Registry, b tpccBenchSpec) { numNodes := b.Nodes + b.LoadConfig.numLoadNodes(b.Distribution) nodes := r.MakeClusterSpec(numNodes, opts...) - minVersion := b.MinVersion - if minVersion == "" { - minVersion = "v19.1.0" // needed for import - } - r.Add(registry.TestSpec{ Name: name, Owner: owner, Cluster: nodes, - Timeout: 5 * time.Hour, + Timeout: 7 * time.Hour, Tags: b.Tags, EncryptionSupport: encryptionSupport, Run: func(ctx context.Context, t test.Test, c cluster.Cluster) {