asim: integrate cluster setting properly

Previously, new cluster settings were created ad hoc throughout asim, making it
hard to change cluster settings. In addition, it was also hard to distinguish
between simulation and cluster settings. This commit adds a cluster settings
field to the simulation settings struct, initializing it once and passing it
throughout. Note that many simulation settings that should be cluster settings
still remain; a TODO is left to clean this up in the future.

Epic: none
Release note: none

Author: wenyihu6

pkg/kv/kvserver/asim/config/BUILD.bazel

@@ -5,4 +5,5 @@ go_library(
     srcs = ["settings.go"],
     importpath = "github.com/cockroachdb/cockroach/pkg/kv/kvserver/asim/config",
     visibility = ["//visibility:public"],
+    deps = ["//pkg/settings/cluster"],
 )

pkg/kv/kvserver/asim/config/settings.go

@@ -5,7 +5,11 @@
 
 package config
 
-import "time"
+import (
+	"time"
+
+	"github.com/cockroachdb/cockroach/pkg/settings/cluster"
+)
 
 const (
 	defaultTickInteval             = 500 * time.Millisecond
@@ -114,6 +118,11 @@ type SimulationSettings struct {
 	LeaseQueueEnabled bool
 	// SplitQueueEnabled controls whether the split queue is enabled.
 	SplitQueueEnabled bool
+	// st is used to update cockroach cluster settings.
+	//
+	// TODO(wenyihu6): Remove any non-simulation settings from this struct and
+	// instead override the settings below.
+	ST *cluster.Settings
 }
 
 // DefaultSimulationSettings returns a set of default settings for simulation.
@@ -143,6 +152,7 @@ func DefaultSimulationSettings() *SimulationSettings {
 		ReplicateQueueEnabled:   true,
 		LeaseQueueEnabled:       true,
 		SplitQueueEnabled:       true,
+		ST:                      cluster.MakeClusterSettings(),
 	}
 }
 

pkg/kv/kvserver/asim/gossip/gossip.go

@@ -50,7 +50,9 @@ type storeGossiper struct {
 }
 
 func newStoreGossiper(
-	descriptorGetter func(cached bool) roachpb.StoreDescriptor, clock timeutil.TimeSource,
+	descriptorGetter func(cached bool) roachpb.StoreDescriptor,
+	clock timeutil.TimeSource,
+	st *cluster.Settings,
 ) *storeGossiper {
 	sg := &storeGossiper{
 		lastIntervalGossip: time.Time{},
@@ -59,7 +61,7 @@ func newStoreGossiper(
 
 	desc := sg.descriptorGetter(false /* cached */)
 	knobs := kvserver.StoreGossipTestingKnobs{AsyncDisabled: true}
-	sg.local = kvserver.NewStoreGossip(sg, sg, knobs, &cluster.MakeTestingClusterSettings().SV, clock)
+	sg.local = kvserver.NewStoreGossip(sg, sg, knobs, &st.SV, clock)
 	sg.local.Ident = roachpb.StoreIdent{StoreID: desc.StoreID, NodeID: desc.Node.NodeID}
 
 	return sg
@@ -122,7 +124,7 @@ func (g *gossip) addStoreToGossip(s state.State, storeID state.StoreID) {
 	g.storeGossip[storeID] = &storeGossiper{addingStore: true}
 	g.storeGossip[storeID] = newStoreGossiper(func(cached bool) roachpb.StoreDescriptor {
 		return s.StoreDescriptors(cached, storeID)[0]
-	}, s.Clock())
+	}, s.Clock(), g.settings.ST)
 }
 
 // Tick checks for completed gossip updates and triggers new gossip

pkg/kv/kvserver/asim/state/helpers.go

@@ -59,12 +59,14 @@ func testingResetLoad(s State, rangeID RangeID) {
 // NewStorePool returns a store pool with no gossip instance and default values
 // for configuration.
 func NewStorePool(
-	nodeCountFn storepool.NodeCountFunc, nodeLivenessFn storepool.NodeLivenessFunc, hlc *hlc.Clock,
+	nodeCountFn storepool.NodeCountFunc,
+	nodeLivenessFn storepool.NodeLivenessFunc,
+	hlc *hlc.Clock,
+	st *cluster.Settings,
 ) (*storepool.StorePool, *cluster.Settings) {
 	stopper := stop.NewStopper()
 	defer stopper.Stop(context.Background())
 
-	st := cluster.MakeTestingClusterSettings()
 	ambientCtx := log.MakeTestingAmbientContext(stopper.Tracer())
 
 	// Never gossip, pass in nil values.

pkg/kv/kvserver/asim/state/impl.go

@@ -518,7 +518,7 @@ func (s *state) AddStore(nodeID NodeID) (Store, bool) {
 	node := s.nodes[nodeID]
 	s.storeSeqGen++
 	storeID := s.storeSeqGen
-	sp, st := NewStorePool(s.NodeCountFn(), s.NodeLivenessFn(), hlc.NewClockForTesting(s.clock))
+	sp, st := NewStorePool(s.NodeCountFn(), s.NodeLivenessFn(), hlc.NewClockForTesting(s.clock), s.settings.ST)
 	store := &store{
 		storeID:   storeID,
 		nodeID:    nodeID,
@@ -1279,7 +1279,7 @@ func (s *state) Scan(
 func (s *state) Report() roachpb.SpanConfigConformanceReport {
 	reporter := spanconfigreporter.New(
 		s.nodeLiveness, s, s, s,
-		cluster.MakeClusterSettings(), &spanconfig.TestingKnobs{})
+		s.settings.ST, &spanconfig.TestingKnobs{})
 	report, err := reporter.SpanConfigConformance(context.Background(), []roachpb.Span{{}})
 	if err != nil {
 		panic(fmt.Sprintf("programming error: error getting span config report %s", err.Error()))