pcr: delete physical_replication.enabled setting

Release note (enterprise change): Physical Cluster Replication is now always enabled, and the setting physical_replication.enabled has been removed.
cockroachdb · Feb 13, 2024 · b5dbc5f · b5dbc5f
1 parent 730ffe0
commit b5dbc5f
Show file tree

Hide file tree

Showing 16 changed files with 7 additions and 62 deletions.
diff --git a/pkg/ccl/backupccl/tenant_backup_nemesis_test.go b/pkg/ccl/backupccl/tenant_backup_nemesis_test.go
@@ -397,9 +397,6 @@ func newBackupNemesis(
 						n.t.Log("already hit replication limit")
 						return nil
 					}
-					if _, err := hostDB.Exec("SET CLUSTER SETTING physical_replication.enabled = true"); err != nil {
-						return err
-					}
 					if _, err := hostDB.Exec("SET CLUSTER SETTING kv.rangefeed.enabled = true"); err != nil {
 						return err
 					}

diff --git a/pkg/ccl/streamingccl/replicationtestutils/replication_helpers.go b/pkg/ccl/streamingccl/replicationtestutils/replication_helpers.go
@@ -223,7 +223,6 @@ func NewReplicationHelper(
 	sqlDB.ExecMultiple(t,
 		// Required for replication stremas to work.
 		`SET CLUSTER SETTING kv.rangefeed.enabled = true`,
-		`SET CLUSTER SETTING physical_replication.enabled = true`,
 
 		// Speeds up the tests a bit.
 		`SET CLUSTER SETTING kv.rangefeed.closed_timestamp_refresh_interval = '200ms'`,

diff --git a/pkg/ccl/streamingccl/replicationtestutils/testutils.go b/pkg/ccl/streamingccl/replicationtestutils/testutils.go
@@ -157,8 +157,6 @@ func (c *TenantStreamingClusters) init(ctx context.Context) {
 	if c.Args.DestInitFunc != nil {
 		c.Args.DestInitFunc(c.T, c.DestSysSQL)
 	}
-	c.SrcSysSQL.Exec(c.T, `SET CLUSTER SETTING physical_replication.enabled = true;`)
-	c.DestSysSQL.Exec(c.T, `SET CLUSTER SETTING physical_replication.enabled = true;`)
 }
 
 // StartDestTenant starts the destination tenant and returns a cleanup function

diff --git a/pkg/ccl/streamingccl/settings.go b/pkg/ccl/streamingccl/settings.go
@@ -14,16 +14,6 @@ import (
 	"github.com/cockroachdb/cockroach/pkg/settings"
 )
 
-// CrossClusterReplicationEnabled enables the ability to setup and control a
-// cross cluster replication stream.
-var CrossClusterReplicationEnabled = settings.RegisterBoolSetting(
-	settings.SystemVisible,
-	"cross_cluster_replication.enabled",
-	"enables the ability to setup and control a cross cluster replication stream",
-	false,
-	settings.WithName("physical_replication.enabled"),
-)
-
 // StreamReplicationStreamLivenessTrackFrequency controls frequency to check
 // the liveness of a streaming replication producer job.
 var StreamReplicationStreamLivenessTrackFrequency = settings.RegisterDurationSetting(

diff --git a/pkg/ccl/streamingccl/streamingest/alter_replication_job.go b/pkg/ccl/streamingccl/streamingest/alter_replication_job.go
@@ -138,16 +138,6 @@ func alterReplicationJobTypeCheck(
 	return true, nil, nil
 }
 
-var physicalReplicationDisabledErr = errors.WithTelemetry(
-	pgerror.WithCandidateCode(
-		errors.WithHint(
-			errors.Newf("physical replication is disabled"),
-			"You can enable physical replication by running `SET CLUSTER SETTING physical_replication.enabled = true`.",
-		),
-		pgcode.ExperimentalFeature,
-	),
-	"physical_replication.enabled")
-
 func alterReplicationJobHook(
 	ctx context.Context, stmt tree.Statement, p sql.PlanHookState,
 ) (sql.PlanHookRowFn, colinfo.ResultColumns, []sql.PlanNode, bool, error) {
@@ -156,10 +146,6 @@ func alterReplicationJobHook(
 		return nil, nil, nil, false, nil
 	}
 
-	if !streamingccl.CrossClusterReplicationEnabled.Get(&p.ExecCfg().Settings.SV) {
-		return nil, nil, nil, false, physicalReplicationDisabledErr
-	}
-
 	if !p.ExecCfg().Codec.ForSystemTenant() {
 		return nil, nil, nil, false, pgerror.Newf(pgcode.InsufficientPrivilege,
 			"only the system tenant can alter tenant")

diff --git a/pkg/ccl/streamingccl/streamingest/replication_random_client_test.go b/pkg/ccl/streamingccl/streamingest/replication_random_client_test.go
@@ -218,13 +218,6 @@ func TestStreamIngestionJobWithRandomClient(t *testing.T) {
 	streamAddr := getTestRandomClientURI(roachpb.MustMakeTenantID(oldTenantID), oldTenantName)
 	query := fmt.Sprintf(`CREATE TENANT "30" FROM REPLICATION OF "10" ON '%s'`, streamAddr)
 
-	// Attempt to run the ingestion job without enabling the experimental setting.
-	_, err = conn.Exec(query)
-	require.True(t, testutils.IsError(err, "physical replication is disabled"))
-
-	_, err = conn.Exec(`SET CLUSTER SETTING physical_replication.enabled = true;`)
-	require.NoError(t, err)
-
 	_, err = conn.Exec(query)
 	require.NoError(t, err)
 

diff --git a/pkg/ccl/streamingccl/streamingest/stream_ingestion_job_test.go b/pkg/ccl/streamingccl/streamingest/stream_ingestion_job_test.go
@@ -51,7 +51,6 @@ func TestTenantStreamingCreationErrors(t *testing.T) {
 
 	sysSQL := sqlutils.MakeSQLRunner(db)
 	sysSQL.Exec(t, `SET CLUSTER SETTING kv.rangefeed.enabled = true`)
-	sysSQL.Exec(t, `SET CLUSTER SETTING physical_replication.enabled = true`)
 
 	srcPgURL, cleanupSink := sqlutils.PGUrl(t, srv.SystemLayer().AdvSQLAddr(), t.Name(), url.User(username.RootUser))
 	defer cleanupSink()
@@ -129,7 +128,6 @@ func TestTenantStreamingFailback(t *testing.T) {
 	defer cleanupURLB()
 
 	for _, s := range []string{
-		"SET CLUSTER SETTING physical_replication.enabled = true",
 		"SET CLUSTER SETTING kv.rangefeed.enabled = true",
 		"SET CLUSTER SETTING kv.rangefeed.closed_timestamp_refresh_interval = '200ms'",
 		"SET CLUSTER SETTING kv.closed_timestamp.target_duration = '100ms'",

diff --git a/pkg/ccl/streamingccl/streamingest/stream_ingestion_planning.go b/pkg/ccl/streamingccl/streamingest/stream_ingestion_planning.go
@@ -99,10 +99,6 @@ func ingestionPlanHook(
 		return nil, nil, nil, false, nil
 	}
 
-	if !streamingccl.CrossClusterReplicationEnabled.Get(&p.ExecCfg().Settings.SV) {
-		return nil, nil, nil, false, physicalReplicationDisabledErr
-	}
-
 	if !p.ExecCfg().Codec.ForSystemTenant() {
 		return nil, nil, nil, false, pgerror.Newf(pgcode.InsufficientPrivilege,
 			"only the system tenant can create other tenants")

diff --git a/pkg/ccl/streamingccl/streamproducer/replication_stream_test.go b/pkg/ccl/streamingccl/streamproducer/replication_stream_test.go
@@ -187,11 +187,7 @@ func startReplication(
 	conn, err := pgx.ConnectConfig(queryCtx, pgxConfig)
 	require.NoError(t, err)
 
-	rows, err := conn.Query(queryCtx, `SET CLUSTER SETTING physical_replication.enabled = true;`)
-	require.NoError(t, err)
-	rows.Close()
-
-	rows, err = conn.Query(queryCtx, `SET avoid_buffering = true`)
+	rows, err := conn.Query(queryCtx, `SET avoid_buffering = true`)
 	require.NoError(t, err)
 	rows.Close()
 	rows, err = conn.Query(queryCtx, create, args...)

diff --git a/pkg/cmd/roachtest/tests/cluster_to_cluster.go b/pkg/cmd/roachtest/tests/cluster_to_cluster.go
@@ -1756,7 +1756,7 @@ func srcClusterSettings(t test.Test, db *sqlutils.SQLRunner) {
 }
 
 func destClusterSettings(t test.Test, db *sqlutils.SQLRunner, additionalDuration time.Duration) {
-	db.ExecMultiple(t, `SET CLUSTER SETTING cross_cluster_replication.enabled = true;`,
+	db.ExecMultiple(t,
 		`SET CLUSTER SETTING kv.rangefeed.enabled = true;`,
 		`SET CLUSTER SETTING stream_replication.replan_flow_threshold = 0.1;`,
 		`SET CLUSTER SETTING physical_replication.consumer.node_lag_replanning_threshold = '5m';`)

diff --git a/pkg/configprofiles/profiles.go b/pkg/configprofiles/profiles.go
@@ -155,7 +155,6 @@ func enableReplication(baseTasks []autoconfigpb.Task) []autoconfigpb.Task {
 		makeTask("enable rangefeeds and replication",
 			/* nonTxnSQL */ []string{
 				"SET CLUSTER SETTING kv.rangefeed.enabled = true",
-				"SET CLUSTER SETTING physical_replication.enabled = true",
 			},
 			nil, /* txnSQL */
 		),

diff --git a/pkg/configprofiles/testdata/virtual-app b/pkg/configprofiles/testdata/virtual-app
@@ -21,13 +21,11 @@ WHERE variable IN (
 'sql.drop_virtual_cluster.enabled',
 'sql.create_virtual_cluster.default_template',
 'server.controller.default_target_cluster',
-'kv.rangefeed.enabled',
-'physical_replication.enabled'
+'kv.rangefeed.enabled'
 )
 ORDER BY variable
 ----
 kv.rangefeed.enabled false
-physical_replication.enabled false
 server.controller.default_target_cluster application
 spanconfig.range_coalescing.application.enabled false
 spanconfig.range_coalescing.system.enabled false

diff --git a/pkg/configprofiles/testdata/virtual-app-repl b/pkg/configprofiles/testdata/virtual-app-repl
@@ -22,13 +22,11 @@ WHERE variable IN (
 'sql.drop_virtual_cluster.enabled',
 'sql.create_virtual_cluster.default_template',
 'server.controller.default_target_cluster',
-'kv.rangefeed.enabled',
-'physical_replication.enabled'
+'kv.rangefeed.enabled'
 )
 ORDER BY variable
 ----
 kv.rangefeed.enabled true
-physical_replication.enabled true
 server.controller.default_target_cluster application
 spanconfig.range_coalescing.application.enabled false
 spanconfig.range_coalescing.system.enabled false

diff --git a/pkg/configprofiles/testdata/virtual-noapp b/pkg/configprofiles/testdata/virtual-noapp
@@ -17,13 +17,11 @@ WHERE variable IN (
 'sql.drop_virtual_cluster.enabled',
 'sql.create_virtual_cluster.default_template',
 'server.controller.default_target_cluster',
-'kv.rangefeed.enabled',
-'physical_replication.enabled'
+'kv.rangefeed.enabled'
 )
 ORDER BY variable
 ----
 kv.rangefeed.enabled false
-physical_replication.enabled false
 server.controller.default_target_cluster system
 spanconfig.range_coalescing.application.enabled false
 spanconfig.range_coalescing.system.enabled false

diff --git a/pkg/configprofiles/testdata/virtual-noapp-repl b/pkg/configprofiles/testdata/virtual-noapp-repl
@@ -17,13 +17,11 @@ WHERE variable IN (
 'sql.drop_virtual_cluster.enabled',
 'sql.create_virtual_cluster.default_template',
 'server.controller.default_target_cluster',
-'kv.rangefeed.enabled',
-'physical_replication.enabled'
+'kv.rangefeed.enabled'
 )
 ORDER BY variable
 ----
 kv.rangefeed.enabled true
-physical_replication.enabled true
 server.controller.default_target_cluster system
 spanconfig.range_coalescing.application.enabled false
 spanconfig.range_coalescing.system.enabled false

diff --git a/pkg/settings/registry.go b/pkg/settings/registry.go
@@ -238,6 +238,7 @@ var retiredSettings = map[InternalKey]struct{}{
 	"kv.rangefeed.use_dedicated_connection_class.enabled":  {},
 	"sql.trace.session_eventlog.enabled":                   {},
 	"sql.show_ranges_deprecated_behavior.enabled":          {},
+	"physical_replication.enabled":                         {},
 }
 
 // sqlDefaultSettings is the list of "grandfathered" existing sql.defaults