Merge #113280 #113323

113280: streamingccl: add setting to disable mux rangefeeds r=msbutler a=stevendanna Since mux rangefeeds are still default off, we want the ability to opt out of them if we find an issue with them. Epic: none Release note: None 113323: roachtest: delete version/mixed tests r=renatolabs a=DarrylWong This commit deletes the version/mixed roachtests. These tests do very little, only testing that upgrades finish. This is tested by other mixed-version tests, rendering these tests redundant. Note that these tests did test upgrades for clusters of size 5, something we don't do elsewhere. However it isn't worth it to have a separate test for this. Release note: None Epic: CRDB-19321 Fixes: #110538 Informs: #110528 Co-authored-by: Steven Danna <[email protected]> Co-authored-by: DarrylWong <[email protected]>
cockroachdb · Oct 31, 2023 · 41c9a0f · 41c9a0f
3 parents 6bd0235 + e3b26a7 + 832bbc5
commit 41c9a0f
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 239 deletions.
diff --git a/pkg/ccl/streamingccl/settings.go b/pkg/ccl/streamingccl/settings.go
@@ -57,6 +57,14 @@ var StreamReplicationMinCheckpointFrequency = settings.RegisterDurationSetting(
 	settings.WithName("physical_replication.producer.min_checkpoint_frequency"),
 )
 
+// StreamProducerMuxRangefeeds controls whether we start event streams using the mux rangefeeds.
+var StreamProducerMuxRangefeeds = settings.RegisterBoolSetting(
+	settings.SystemOnly,
+	"physical_replication.producer.mux_rangefeeds.enabled",
+	"controls whether rangefeeds used for physical replication use mux rangefeeds",
+	true,
+)
+
 // StreamReplicationConsumerHeartbeatFrequency controls frequency the stream replication
 // destination cluster sends heartbeat to the source cluster to keep the stream alive.
 var StreamReplicationConsumerHeartbeatFrequency = settings.RegisterDurationSetting(

diff --git a/pkg/ccl/streamingccl/streamproducer/event_stream.go b/pkg/ccl/streamingccl/streamproducer/event_stream.go
@@ -14,6 +14,7 @@ import (
 	"runtime/pprof"
 	"time"
 
+	"github.com/cockroachdb/cockroach/pkg/ccl/streamingccl"
 	"github.com/cockroachdb/cockroach/pkg/ccl/streamingccl/replicationutils"
 	"github.com/cockroachdb/cockroach/pkg/jobs"
 	"github.com/cockroachdb/cockroach/pkg/jobs/jobspb"
@@ -108,6 +109,8 @@ func (s *eventStream) Start(ctx context.Context, txn *kv.Txn) error {
 
 	s.doneChan = make(chan struct{})
 
+	useMux := streamingccl.StreamProducerMuxRangefeeds.Get(&s.execCfg.Settings.SV)
+
 	// Common rangefeed options.
 	opts := []rangefeed.Option{
 		rangefeed.WithPProfLabel("job", fmt.Sprintf("id=%d", s.streamID)),
@@ -120,7 +123,7 @@ func (s *eventStream) Start(ctx context.Context, txn *kv.Txn) error {
 		rangefeed.WithMemoryMonitor(s.mon),
 
 		rangefeed.WithOnSSTable(s.onSSTable),
-		rangefeed.WithMuxRangefeed(true),
+		rangefeed.WithMuxRangefeed(useMux),
 		rangefeed.WithOnDeleteRange(s.onDeleteRange),
 	}
 

diff --git a/pkg/cmd/roachtest/tests/BUILD.bazel b/pkg/cmd/roachtest/tests/BUILD.bazel
@@ -179,7 +179,6 @@ go_library(
         "util_if_local.go",
         "util_load_group.go",
         "validate_system_schema_after_version_upgrade.go",
-        "version.go",
         "versionupgrade.go",
         "ycsb.go",
     ],

diff --git a/pkg/cmd/roachtest/tests/registry.go b/pkg/cmd/roachtest/tests/registry.go
@@ -148,7 +148,6 @@ func RegisterTests(r registry.Registry) {
 	registerTypeORM(r)
 	registerUnoptimizedQueryOracle(r)
 	registerValidateSystemSchemaAfterVersionUpgrade(r)
-	registerVersion(r)
 	registerYCSB(r)
 	registerDeclarativeSchemaChangerJobCompatibilityInMixedVersion(r)
 }
diff --git a/pkg/cmd/roachtest/tests/version.go b/pkg/cmd/roachtest/tests/version.go