Skip to content

Commit e13298a

Browse files
committed
roachtest: don't consistency check mixed 2.1/19.1 cluster
See #37737 (comment). Release note: None
1 parent e6e8cae commit e13298a

File tree

1 file changed

+11
-3
lines changed

1 file changed

+11
-3
lines changed

pkg/cmd/roachtest/version.go

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import (
2020
"fmt"
2121
"runtime"
2222
"strconv"
23+
"strings"
2324
"time"
2425

2526
"github.com/cockroachdb/cockroach/pkg/util/binfetcher"
@@ -105,9 +106,16 @@ func registerVersion(r *registry) {
105106
if err := rows.Close(); err != nil {
106107
return err
107108
}
108-
// Regression test for #37425.
109-
if err := c.CheckReplicaDivergenceOnDB(ctx, db); err != nil {
110-
return errors.Wrapf(err, "node %d", i)
109+
// Regression test for #37425. We can't run this in 2.1 because
110+
// 19.1 changed downstream-of-raft semantics for consistency
111+
// checks but unfortunately our versioning story for these
112+
// checks had been broken for a long time. See:
113+
//
114+
// https://github.com/cockroachdb/cockroach/issues/37737#issuecomment-496026918
115+
if !strings.HasPrefix(version, "2.") {
116+
if err := c.CheckReplicaDivergenceOnDB(ctx, db); err != nil {
117+
return errors.Wrapf(err, "node %d", i)
118+
}
111119
}
112120
}
113121
return nil

0 commit comments

Comments
 (0)