Merge pull request #110505 from cockroachdb/blathers/backport-release…

…-23.1-110390

release-23.1: storage: skip TestMVCCScanWithLargeKeyValue under race

pkg/storage/pebble_mvcc_scanner_test.go

@@ -21,6 +21,7 @@ import (
 	"github.com/cockroachdb/cockroach/pkg/roachpb"
 	"github.com/cockroachdb/cockroach/pkg/settings/cluster"
 	"github.com/cockroachdb/cockroach/pkg/storage/enginepb"
+	"github.com/cockroachdb/cockroach/pkg/testutils/skip"
 	"github.com/cockroachdb/cockroach/pkg/util/hlc"
 	"github.com/cockroachdb/cockroach/pkg/util/leaktest"
 	"github.com/cockroachdb/cockroach/pkg/util/mon"
@@ -124,6 +125,8 @@ func TestMVCCScanWithManyVersionsAndSeparatedIntents(t *testing.T) {
 
 func TestMVCCScanWithLargeKeyValue(t *testing.T) {
 	defer leaktest.AfterTest(t)()
+	// This test has been observed to trip the disk-stall detector under -race.
+	skip.UnderRace(t, "large copies and memfs mutexes can cause excessive delays within VFS stack")
 
 	eng := createTestPebbleEngine()
 	defer eng.Close()