asim: use cluster setting for some non-simulation settings

Previously, we began populating cluster settings in the simulator to allow
direct use of non-simulation settings. This commit updates LoadThreshold,
kvserver.LBRebalancingObjective, and allocatorimpl.LoadRebalanceRequiredMinDiff
to use values from the populated cluster settings directly.

Epic: none
Release note: none

Author: wenyihu6

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

@@ -30,7 +30,6 @@ const (
 	defaultLBRebalancingMode       = 2 // Leases and replicas.
 	defaultLBRebalancingInterval   = time.Minute
 	defaultLBRebalanceQPSThreshold = 0.1
-	defaultLBMinRequiredQPSDiff    = 200
 	defaultLBRebalancingObjective  = 0 // QPS
 )
 
@@ -105,13 +104,6 @@ type SimulationSettings struct {
 	// LBRebalancingInterval controls how often the store rebalancer will
 	// consider opportunities for rebalancing.
 	LBRebalancingInterval time.Duration
-	// LBRebalanceQPSThreshold is the fraction above or below the mean store QPS,
-	// that a store is considered overfull or underfull.
-	LBRebalanceQPSThreshold float64
-	// LBMinQPSDifferenceForTransfers is the minimum QPS difference that the store
-	// rebalancer would care to reconcile (via lease or replica rebalancing) between
-	// any two stores.
-	LBMinRequiredQPSDiff float64
 	// ReplicateQueueEnabled controls whether the replicate queue is enabled.
 	ReplicateQueueEnabled bool
 	// LeaseQueueEnabled controls whether the lease queue is enabled.
@@ -147,8 +139,6 @@ func DefaultSimulationSettings() *SimulationSettings {
 		LBRebalancingMode:       defaultLBRebalancingMode,
 		LBRebalancingObjective:  defaultLBRebalancingObjective,
 		LBRebalancingInterval:   defaultLBRebalancingInterval,
-		LBRebalanceQPSThreshold: defaultLBRebalanceQPSThreshold,
-		LBMinRequiredQPSDiff:    defaultLBMinRequiredQPSDiff,
 		ReplicateQueueEnabled:   true,
 		LeaseQueueEnabled:       true,
 		SplitQueueEnabled:       true,

pkg/kv/kvserver/asim/storerebalancer/store_rebalancer.go

@@ -7,6 +7,7 @@ package storerebalancer
 
 import (
 	"context"
+	"fmt"
 	"time"
 
 	"github.com/cockroachdb/cockroach/pkg/kv/kvserver"
@@ -128,14 +129,15 @@ func (s simRebalanceObjectiveProvider) Objective() kvserver.LBRebalancingObjecti
 }
 
 func (src *storeRebalancerControl) scorerOptions() *allocatorimpl.LoadScorerOptions {
+	dim := kvserver.LBRebalancingObjective(src.settings.LBRebalancingObjective).ToDimension()
 	return &allocatorimpl.LoadScorerOptions{
 		IOOverloadOptions:            src.allocator.IOOverloadOptions(),
 		DiskOptions:                  src.allocator.DiskOptions(),
 		Deterministic:                true,
-		LoadDims:                     []load.Dimension{load.Queries},
-		LoadThreshold:                allocatorimpl.MakeQPSOnlyDim(src.settings.LBRebalanceQPSThreshold),
-		MinLoadThreshold:             allocatorimpl.LoadMinThresholds(load.Queries),
-		MinRequiredRebalanceLoadDiff: allocatorimpl.MakeQPSOnlyDim(src.settings.LBMinRequiredQPSDiff),
+		LoadDims:                     []load.Dimension{dim},
+		LoadThreshold:                allocatorimpl.LoadThresholds(&src.settings.ST.SV, dim),
+		MinLoadThreshold:             allocatorimpl.LoadMinThresholds(dim),
+		MinRequiredRebalanceLoadDiff: allocatorimpl.LoadRebalanceRequiredMinDiff(&src.settings.ST.SV, dim),
 	}
 }
 

pkg/kv/kvserver/asim/tests/datadriven_simulation_test.go

@@ -500,7 +500,6 @@ func TestDataDriven(t *testing.T) {
 				scanIfExists(t, d, "split_queue_enabled", &settingsGen.Settings.SplitQueueEnabled)
 				scanIfExists(t, d, "rebalance_mode", &settingsGen.Settings.LBRebalancingMode)
 				scanIfExists(t, d, "rebalance_interval", &settingsGen.Settings.LBRebalancingInterval)
-				scanIfExists(t, d, "rebalance_qps_threshold", &settingsGen.Settings.LBRebalanceQPSThreshold)
 				scanIfExists(t, d, "split_qps_threshold", &settingsGen.Settings.SplitQPSThreshold)
 				scanIfExists(t, d, "rebalance_range_threshold", &settingsGen.Settings.RangeRebalanceThreshold)
 				scanIfExists(t, d, "gossip_delay", &settingsGen.Settings.StateExchangeDelay)