sctest: pass around cluster settings instead of always generating new

Previously, the end_to_end test would always create a new set of cluster
settings when spawning a subtest, causing cluster settings made during
setup to be lost. This change causes subtests to inherit settings,
retaining them.

Release note: None

Author: mw5h

pkg/sql/schemachanger/scdeps/sctestdeps/config.go

@@ -8,6 +8,7 @@ package sctestdeps
 import (
 	"time"
 
+	"github.com/cockroachdb/cockroach/pkg/settings/cluster"
 	"github.com/cockroachdb/cockroach/pkg/sql/catalog"
 	"github.com/cockroachdb/cockroach/pkg/sql/catalog/catalogkeys"
 	"github.com/cockroachdb/cockroach/pkg/sql/catalog/descidgen"
@@ -166,6 +167,16 @@ func WithReferenceProviderFactory(f scbuild.ReferenceProviderFactory) Option {
 	})
 }
 
+func WithClusterSettings(cs *cluster.Settings) Option {
+	return optionFunc(func(state *TestState) {
+		state.clusterSettings = cs
+		// Update evalCtx settings if it already exists
+		if state.evalCtx != nil {
+			state.evalCtx.Settings = cs
+		}
+	})
+}
+
 var (
 	// defaultOverriddenCreatedAt is used to populate the CreatedAt timestamp for
 	// all descriptors injected into the catalog. We inject this to make the

pkg/sql/schemachanger/scdeps/sctestdeps/test_deps.go

@@ -88,6 +88,9 @@ func (s *TestState) SessionData() *sessiondata.SessionData {
 
 // ClusterSettings implements the scbuild.Dependencies interface.
 func (s *TestState) ClusterSettings() *cluster.Settings {
+	if s.clusterSettings != nil {
+		return s.clusterSettings
+	}
 	return cluster.MakeTestingClusterSettings()
 }
 

pkg/sql/schemachanger/scdeps/sctestdeps/test_state.go

@@ -15,6 +15,7 @@ import (
 	"github.com/cockroachdb/cockroach/pkg/jobs"
 	"github.com/cockroachdb/cockroach/pkg/jobs/jobspb"
 	"github.com/cockroachdb/cockroach/pkg/security/username"
+	"github.com/cockroachdb/cockroach/pkg/settings/cluster"
 	"github.com/cockroachdb/cockroach/pkg/sql/catalog"
 	"github.com/cockroachdb/cockroach/pkg/sql/catalog/catalogkeys"
 	"github.com/cockroachdb/cockroach/pkg/sql/catalog/descpb"
@@ -81,6 +82,7 @@ type TestState struct {
 
 	catalogChanges     catalogChanges
 	refProviderFactory scbuild.ReferenceProviderFactory
+	clusterSettings    *cluster.Settings
 }
 
 type catalogChanges struct {

pkg/sql/schemachanger/sctest/end_to_end.go

@@ -153,6 +153,7 @@ func EndToEndSideEffects(t *testing.T, relTestCaseDir string, factory TestServer
 					sctestdeps.WithComments(sctestdeps.ReadCommentsFromDB(t, tdb)),
 					sctestdeps.WithIDGenerator(s.ApplicationLayer()),
 					sctestdeps.WithReferenceProviderFactory(refFactory),
+					sctestdeps.WithClusterSettings(s.ClusterSettings()),
 				)
 				stmtStates := execStatementWithTestDeps(ctx, t, deps, stmts...)
 				var fileNameSuffix string