Merge #98472 #98475

98472: changefeedccl: enable TestChangefeedPropagatesTerminalError r=samiskin a=samiskin Fixes: #95057 The test TestChangefeedPropagatesTerminalError no longer seems to flake after running it under stress on a GCE worker for a while, so this change re-enables it. Release note: None 98475: kvnemesis: disable `AddSSTable` range keys r=erikgrinaker a=erikgrinaker These trigger MVCC stats bugs in `CheckSSTConflicts`. Touches #94141. Touches #98473. Touches #94876. Epic: none Release note: None Co-authored-by: Shiranka Miskin <[email protected]> Co-authored-by: Erik Grinaker <[email protected]>
cockroachdb · Mar 13, 2023 · 6a41a2f · 6a41a2f
3 parents 9ed78bf + 1ffbd33 + 9109678
commit 6a41a2f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/pkg/ccl/changefeedccl/changefeed_test.go b/pkg/ccl/changefeedccl/changefeed_test.go
@@ -6019,7 +6019,6 @@ func TestChangefeedHandlesDrainingNodes(t *testing.T) {
 
 func TestChangefeedPropagatesTerminalError(t *testing.T) {
 	defer leaktest.AfterTest(t)()
-	skip.WithIssue(t, 95057, "flaky test")
 	defer log.Scope(t).Close(t)
 
 	opts := makeOptions()

diff --git a/pkg/kv/kvnemesis/generator.go b/pkg/kv/kvnemesis/generator.go
@@ -525,7 +525,12 @@ func randAddSSTable(g *generator, rng *rand.Rand) Operation {
 	probTombstone := 0.2             // probability to write a tombstone
 	asWrites := rng.Float64() < 0.2  // IngestAsWrites
 
-	if r := rng.Float64(); r < 0.8 {
+	if true {
+		// TODO(erikgrinaker): Disable range keys for now since CheckSSTConflicts
+		// computes incorrect MVCC stats. See:
+		// https://github.com/cockroachdb/cockroach/issues/98473
+		numRangeKeys = 0
+	} else if r := rng.Float64(); r < 0.8 {
 		// 80% probability of only point keys.
 		numRangeKeys = 0
 	} else if r < 0.9 {