diff --git a/pkg/cmd/roachtest/acceptance.go b/pkg/cmd/roachtest/acceptance.go index 3662670515be..42fa4a0f0819 100644 --- a/pkg/cmd/roachtest/acceptance.go +++ b/pkg/cmd/roachtest/acceptance.go @@ -25,6 +25,10 @@ func registerAcceptance(r *registry) { // local mode the acceptance tests should be configured to run within a // minute or so as these tests are run on every merge to master. + // NB: zerosum-restart is skipped due to generating various errors during + // its rebalances. See the comment on: + _ = isExpectedRelocateError + testCases := []struct { name string fn func(ctx context.Context, t *test, c *cluster) @@ -33,7 +37,7 @@ func registerAcceptance(r *registry) { {"bank/cluster-recovery", runBankClusterRecovery}, {"bank/node-restart", runBankNodeRestart}, {"bank/zerosum-splits", runBankNodeZeroSum}, - {"bank/zerosum-restart", runBankZeroSumRestart}, + // {"bank/zerosum-restart", runBankZeroSumRestart}, {"build-info", runBuildInfo}, {"cli/node-status", runCLINodeStatus}, {"decommission", runDecommissionAcceptance}, diff --git a/pkg/cmd/roachtest/bank.go b/pkg/cmd/roachtest/bank.go index 47b6221d5607..7188cf1c6754 100644 --- a/pkg/cmd/roachtest/bank.go +++ b/pkg/cmd/roachtest/bank.go @@ -345,7 +345,14 @@ func (s *bankState) startSplitMonkey(ctx context.Context, d time.Duration, c *cl } func isExpectedRelocateError(err error) bool { - return testutils.IsError(err, "(descriptor changed|unable to remove replica .* which is not present|unable to add replica .* which is already present|received invalid ChangeReplicasTrigger .* to remove self|breaker open)") + // See: + // https://github.com/cockroachdb/cockroach/issues/33732 + // https://github.com/cockroachdb/cockroach/issues/33708 + // https://github.cm/cockroachdb/cockroach/issues/34012 + // for more failure modes not caught here. We decided to avoid adding + // to this catchall and to fix the root causes instead. + // We've also seen "breaker open" errors here. + return testutils.IsError(err, "(descriptor changed|unable to remove replica .* which is not present|unable to add replica .* which is already present|received invalid ChangeReplicasTrigger .* to remove self)") } func accountDistribution(r *rand.Rand) *rand.Zipf {