From d8aa9a71c17a3bb613a714a18f7a08e32efcf190 Mon Sep 17 00:00:00 2001 From: Nathan VanBenschoten Date: Mon, 8 Apr 2019 12:05:50 -0400 Subject: [PATCH] roachtest: add new multi-register jepsen test This PR adds the new Jepsen test introduced in: https://github.com/cockroachdb/jepsen/pull/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 --- pkg/cmd/roachtest/jepsen.go | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkg/cmd/roachtest/jepsen.go b/pkg/cmd/roachtest/jepsen.go index 5467e2fb249c..d4e07829c5dc 100644 --- a/pkg/cmd/roachtest/jepsen.go +++ b/pkg/cmd/roachtest/jepsen.go @@ -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 @@ -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 {