asim: add AllocatorSync to asim queues

This commit populates the AllocatorSync field in asim queues. It will
be used in future commits to coordinate changes with mma.

Epic: none
Release note: none

Author: wenyihu6

pkg/kv/kvserver/asim/asim.go

@@ -145,6 +145,7 @@ func (s *Simulator) addStore(storeID state.StoreID, tick time.Time) {
 		s.changer,
 		s.settings,
 		allocator,
+		s.state.Node(store.NodeID()).AllocatorSync(),
 		storePool,
 		tick,
 	)
@@ -154,6 +155,7 @@ func (s *Simulator) addStore(storeID state.StoreID, tick time.Time) {
 		s.changer,
 		s.settings,
 		allocator,
+		s.state.Node(store.NodeID()).AllocatorSync(),
 		storePool,
 		tick,
 	)

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

@@ -16,6 +16,7 @@ go_library(
         "//pkg/kv/kvpb",
         "//pkg/kv/kvserver/allocator",
         "//pkg/kv/kvserver/allocator/allocatorimpl",
+        "//pkg/kv/kvserver/allocator/mmaprototypehelpers",
         "//pkg/kv/kvserver/allocator/plan",
         "//pkg/kv/kvserver/allocator/storepool",
         "//pkg/kv/kvserver/asim/config",

pkg/kv/kvserver/asim/queue/lease_queue.go

@@ -12,6 +12,7 @@ import (
 	"time"
 
 	"github.com/cockroachdb/cockroach/pkg/kv/kvserver/allocator/allocatorimpl"
+	"github.com/cockroachdb/cockroach/pkg/kv/kvserver/allocator/mmaprototypehelpers"
 	"github.com/cockroachdb/cockroach/pkg/kv/kvserver/allocator/plan"
 	"github.com/cockroachdb/cockroach/pkg/kv/kvserver/allocator/storepool"
 	"github.com/cockroachdb/cockroach/pkg/kv/kvserver/asim/config"
@@ -28,6 +29,7 @@ type leaseQueue struct {
 	planner   plan.ReplicationPlanner
 	clock     *hlc.Clock
 	settings  *config.SimulationSettings
+	as        *mmaprototypehelpers.AllocatorSync
 }
 
 // NewLeaseQueue returns a new lease queue.
@@ -37,6 +39,7 @@ func NewLeaseQueue(
 	stateChanger state.Changer,
 	settings *config.SimulationSettings,
 	allocator allocatorimpl.Allocator,
+	allocatorSync *mmaprototypehelpers.AllocatorSync,
 	storePool storepool.AllocatorStorePool,
 	start time.Time,
 ) RangeQueue {
@@ -52,6 +55,7 @@ func NewLeaseQueue(
 		planner:   plan.NewLeasePlanner(allocator, storePool),
 		storePool: storePool,
 		clock:     storePool.Clock(),
+		as:        allocatorSync,
 	}
 	lq.AddLogTag("lease", nil)
 	lq.AddLogTag(fmt.Sprintf("n%ds%d", nodeID, storeID), "")

pkg/kv/kvserver/asim/queue/lease_queue_test.go

@@ -144,6 +144,7 @@ func TestLeaseQueue(t *testing.T) {
 				changer,
 				testSettings,
 				s.Allocator(store.StoreID()),
+				s.Node(store.NodeID()).AllocatorSync(),
 				s.StorePool(store.StoreID()),
 				start,
 			)

pkg/kv/kvserver/asim/queue/replicate_queue.go

@@ -12,6 +12,7 @@ import (
 	"time"
 
 	"github.com/cockroachdb/cockroach/pkg/kv/kvserver/allocator/allocatorimpl"
+	"github.com/cockroachdb/cockroach/pkg/kv/kvserver/allocator/mmaprototypehelpers"
 	"github.com/cockroachdb/cockroach/pkg/kv/kvserver/allocator/plan"
 	"github.com/cockroachdb/cockroach/pkg/kv/kvserver/allocator/storepool"
 	"github.com/cockroachdb/cockroach/pkg/kv/kvserver/asim/config"
@@ -26,6 +27,7 @@ type replicateQueue struct {
 	planner  plan.ReplicationPlanner
 	clock    *hlc.Clock
 	settings *config.SimulationSettings
+	as       *mmaprototypehelpers.AllocatorSync
 }
 
 // NewReplicateQueue returns a new replicate queue.
@@ -35,6 +37,7 @@ func NewReplicateQueue(
 	stateChanger state.Changer,
 	settings *config.SimulationSettings,
 	allocator allocatorimpl.Allocator,
+	allocatorSync *mmaprototypehelpers.AllocatorSync,
 	storePool storepool.AllocatorStorePool,
 	start time.Time,
 ) RangeQueue {
@@ -50,6 +53,7 @@ func NewReplicateQueue(
 		planner: plan.NewReplicaPlanner(
 			allocator, storePool, plan.ReplicaPlannerTestingKnobs{}),
 		clock: storePool.Clock(),
+		as:    allocatorSync,
 	}
 	rq.AddLogTag("replica", nil)
 	rq.AddLogTag(fmt.Sprintf("n%ds%d", nodeID, storeID), "")

pkg/kv/kvserver/asim/queue/replicate_queue_test.go

@@ -293,6 +293,7 @@ func TestReplicateQueue(t *testing.T) {
 				changer,
 				testSettings,
 				s.Allocator(store.StoreID()),
+				s.Node(store.NodeID()).AllocatorSync(),
 				s.StorePool(store.StoreID()),
 				start,
 			)