Merge #68894

68894: kvserver: skip `TestStoreRangeMergeConcurrentRequests` under `stress` r=nvanbenschoten a=erikgrinaker The test can fall apart under high concurrency due to timeouts, so skip it under `stress`. Resolves #68703. Release note: None Co-authored-by: Erik Grinaker <[email protected]>
cockroachdb · Aug 13, 2021 · b365f26 · b365f26
2 parents 8adbb79 + c285041
commit b365f26
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/pkg/kv/kvserver/client_merge_test.go b/pkg/kv/kvserver/client_merge_test.go
@@ -2262,6 +2262,7 @@ func TestStoreRangeMergeCheckConsistencyAfterSubsumption(t *testing.T) {
 func TestStoreRangeMergeConcurrentRequests(t *testing.T) {
 	defer leaktest.AfterTest(t)()
 	defer log.Scope(t).Close(t)
+	skip.UnderStress(t, "falls apart with timeouts under high concurrency")
 
 	var store *kvserver.Store
 	manualClock := hlc.NewHybridManualClock()