Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

roachtest: tighten boundaries of tpch_concurrency #88978

Merged
merged 1 commit into from
Sep 30, 2022
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 1 addition & 14 deletions pkg/cmd/roachtest/tests/tpch_concurrency.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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).
Expand Down Expand Up @@ -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{
Expand All @@ -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,
})
}