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.

Sign up for GitHub

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

Jump to bottom

acceptance: properly skip acceptance/bank/zerosum-restart #34080

Merged
merged 1 commit into from
Jan 17, 2019
+22 −19
Merged

acceptance: properly skip acceptance/bank/zerosum-restart #34080

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
40 changes: 21 additions & 19 deletions pkg/cmd/roachtest/acceptance.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,31 +25,32 @@ 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)
skip string
}{
// Sorted. Please keep it that way.
{"bank/cluster-recovery", runBankClusterRecovery},
{"bank/node-restart", runBankNodeRestart},
{"bank/zerosum-splits", runBankNodeZeroSum},
{name: "bank/cluster-recovery", fn: runBankClusterRecovery},
{name: "bank/node-restart", fn: runBankNodeRestart},
{
name: "bank/zerosum-splits", fn: runBankNodeZeroSum,
skip: "https://github.com/cockroachdb/cockroach/issues/33683 (runs " +
"into various errors during its rebalances, see isExpectedRelocateError)",
},
// {"bank/zerosum-restart", runBankZeroSumRestart},
{"build-info", runBuildInfo},
{"cli/node-status", runCLINodeStatus},
{"decommission", runDecommissionAcceptance},
{"cluster-init", runClusterInit},
{"event-log", runEventLog},
{"gossip/peerings", runGossipPeerings},
{"gossip/restart", runGossipRestart},
{"gossip/restart-node-one", runGossipRestartNodeOne},
{"gossip/locality-address", runCheckLocalityIPAddress},
{"rapid-restart", runRapidRestart},
{"status-server", runStatusServer},
{"version-upgrade", runVersionUpgrade},
{name: "build-info", fn: runBuildInfo},
{name: "cli/node-status", fn: runCLINodeStatus},
{name: "decommission", fn: runDecommissionAcceptance},
{name: "cluster-init", fn: runClusterInit},
{name: "event-log", fn: runEventLog},
{name: "gossip/peerings", fn: runGossipPeerings},
{name: "gossip/restart", fn: runGossipRestart},
{name: "gossip/restart-node-one", fn: runGossipRestartNodeOne},
{name: "gossip/locality-address", fn: runCheckLocalityIPAddress},
{name: "rapid-restart", fn: runRapidRestart},
{name: "status-server", fn: runStatusServer},
{name: "version-upgrade", fn: runVersionUpgrade},
}
tags := []string{"default", "quick"}
const numNodes = 4
Expand All @@ -68,6 +69,7 @@ func registerAcceptance(r *registry) {
for _, tc := range testCases {
tc := tc
spec.SubTests = append(spec.SubTests, testSpec{
Skip: tc.skip,
Name: tc.name,
Timeout: 10 * time.Minute,
Tags: tags,
Expand Down
1 change: 1 addition & 0 deletions pkg/cmd/roachtest/bank.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,6 +349,7 @@ func isExpectedRelocateError(err error) bool {
// https://github.com/cockroachdb/cockroach/issues/33732
// https://github.com/cockroachdb/cockroach/issues/33708
// https://github.cm/cockroachdb/cockroach/issues/34012
// https://github.com/cockroachdb/cockroach/issues/33683#issuecomment-454889149
// 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.
Expand Down