Skip to content

Commit

Permalink
Merge #36616
Browse files Browse the repository at this point in the history
36616: roachtest: add new multi-register jepsen test r=bdarnell a=nvanbenschoten

This PR adds the new Jepsen test introduced in: cockroachdb/jepsen#19

The test takes 19-21 minutes per run. I think that means it should go in its own "group". Maybe there's a better group for it to go in.

Release note: None

Co-authored-by: Nathan VanBenschoten <[email protected]>
  • Loading branch information
craig[bot] and nvanbenschoten committed Apr 17, 2019
2 parents 2625275 + d8aa9a7 commit 744edaf
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions pkg/cmd/roachtest/jepsen.go
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ cd /mnt/data1/jepsen/cockroachdb && set -eo pipefail && \
t.l.Printf("failed: %s", testErr)
}

case <-time.After(20 * time.Minute):
case <-time.After(40 * time.Minute):
// Although we run tests of 6 minutes each, we use a timeout
// much larger than that. This is because Jepsen for some
// tests (e.g. register) runs a potentially long analysis
Expand Down Expand Up @@ -287,10 +287,12 @@ func registerJepsen(r *registry) {
//
// NB: the "comments" test is not included because it requires
// linearizability.
// NB: the "multi-register" test takes about twice as long as the other
// tests, so it is included the group of two.
groups := [][]string{
{"bank", "bank-multitable"},
{"g2", "monotonic"},
{"bank", "bank-multitable", "g2"},
{"register", "sequential", "sets"},
{"multi-register", "monotonic"},
}

for i := range groups {
Expand Down

0 comments on commit 744edaf

Please sign in to comment.