diff --git a/pkg/cmd/roachtest/tests/tpcc.go b/pkg/cmd/roachtest/tests/tpcc.go index 9d9650804bde..94e9c9024f11 100644 --- a/pkg/cmd/roachtest/tests/tpcc.go +++ b/pkg/cmd/roachtest/tests/tpcc.go @@ -93,11 +93,6 @@ type tpccOptions struct { // also be doing a rolling-restart into the new binary while the cluster // is running, but that feels like jamming too much into the tpcc setup. Start func(context.Context, test.Test, cluster.Cluster) - // EnableCircuitBreakers causes the kv.replica_circuit_breaker.slow_replication_threshold - // setting to be populated, which enables per-Replica circuit breakers. - // - // TODO(tbg): remove this once https://github.com/cockroachdb/cockroach/issues/74705 is completed. - EnableCircuitBreakers bool // SkipPostRunCheck, if set, skips post TPC-C run checks. SkipPostRunCheck bool DisableDefaultScheduledBackup bool @@ -165,10 +160,6 @@ func setupTPCC( opts.Start(ctx, t, c) db := c.Conn(ctx, t.L(), 1) defer db.Close() - if opts.EnableCircuitBreakers { - _, err := db.Exec(`SET CLUSTER SETTING kv.replica_circuit_breaker.slow_replication_threshold = '15s'`) - require.NoError(t, err) - } if t.SkipInit() { return @@ -508,10 +499,9 @@ func registerTPCC(r registry.Registry) { headroomWarehouses := int(float64(maxWarehouses) * 0.7) t.L().Printf("computed headroom warehouses of %d\n", headroomWarehouses) runTPCC(ctx, t, c, tpccOptions{ - Warehouses: headroomWarehouses, - Duration: 120 * time.Minute, - SetupType: usingImport, - EnableCircuitBreakers: true, + Warehouses: headroomWarehouses, + Duration: 120 * time.Minute, + SetupType: usingImport, }) }, }) diff --git a/pkg/sql/logictest/parallel_test.go b/pkg/sql/logictest/parallel_test.go index 537e1a60574b..ed8e07320542 100644 --- a/pkg/sql/logictest/parallel_test.go +++ b/pkg/sql/logictest/parallel_test.go @@ -218,6 +218,11 @@ func (t *parallelTest) setup(ctx context.Context, spec *parTestSpec) { r0.Exec(t, `UPDATE system.zones SET config = $2 WHERE id = $1`, objID, buf) } + // Disable the circuit breakers on this cluster because they can lead to + // rare test flakes since the machine is likely to be overloaded when + // running TestParallel. + r0.Exec(t, `SET CLUSTER SETTING kv.replica_circuit_breaker.slow_replication_threshold = '0s'`) + if testing.Verbose() || log.V(1) { log.Infof(t.ctx, "Creating database") }