asim: pass node id to queues for logging

This commit passes in the node id to different queues for logging purposes.

Epic: none
Release note: none

Author: wenyihu6

pkg/kv/kvserver/asim/asim.go

@@ -133,8 +133,10 @@ func (s *Simulator) StoreAddNotify(storeID state.StoreID, _ state.State) {
 func (s *Simulator) addStore(storeID state.StoreID, tick time.Time) {
 	allocator := s.state.Allocator(storeID)
 	storePool := s.state.StorePool(storeID)
+	store, _ := s.state.Store(storeID)
 	s.rqs[storeID] = queue.NewReplicateQueue(
 		storeID,
+		store.NodeID(),
 		s.changer,
 		s.settings,
 		allocator,
@@ -143,6 +145,7 @@ func (s *Simulator) addStore(storeID state.StoreID, tick time.Time) {
 	)
 	s.lqs[storeID] = queue.NewLeaseQueue(
 		storeID,
+		store.NodeID(),
 		s.changer,
 		s.settings,
 		allocator,

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

@@ -8,6 +8,7 @@ package queue
 import (
 	"container/heap"
 	"context"
+	"fmt"
 	"time"
 
 	"github.com/cockroachdb/cockroach/pkg/kv/kvserver/allocator/allocatorimpl"
@@ -32,6 +33,7 @@ type leaseQueue struct {
 // NewLeaseQueue returns a new lease queue.
 func NewLeaseQueue(
 	storeID state.StoreID,
+	nodeID state.NodeID,
 	stateChanger state.Changer,
 	settings *config.SimulationSettings,
 	allocator allocatorimpl.Allocator,
@@ -52,6 +54,7 @@ func NewLeaseQueue(
 		clock:     storePool.Clock(),
 	}
 	lq.AddLogTag("lease", nil)
+	lq.AddLogTag(fmt.Sprintf("n%ds%d", nodeID, storeID), "")
 	return &lq
 }
 

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

@@ -140,6 +140,7 @@ func TestLeaseQueue(t *testing.T) {
 			store, _ := s.Store(testingStore)
 			lq := NewLeaseQueue(
 				store.StoreID(),
+				store.NodeID(),
 				changer,
 				testSettings,
 				s.Allocator(store.StoreID()),

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

@@ -31,6 +31,7 @@ type replicateQueue struct {
 // NewReplicateQueue returns a new replicate queue.
 func NewReplicateQueue(
 	storeID state.StoreID,
+	nodeID state.NodeID,
 	stateChanger state.Changer,
 	settings *config.SimulationSettings,
 	allocator allocatorimpl.Allocator,
@@ -51,6 +52,7 @@ func NewReplicateQueue(
 		clock: storePool.Clock(),
 	}
 	rq.AddLogTag("replica", nil)
+	rq.AddLogTag(fmt.Sprintf("n%ds%d", nodeID, storeID), "")
 	return &rq
 }
 
@@ -64,7 +66,7 @@ func (rq *replicateQueue) MaybeAdd(ctx context.Context, replica state.Replica, s
 	}
 
 	repl := NewSimulatorReplica(replica, s)
-	rq.AddLogTag("r", repl.repl.Descriptor())
+	rq.AddLogTag("r", repl.Desc().RangeID)
 	rq.AnnotateCtx(ctx)
 
 	desc := repl.Desc()

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

@@ -289,6 +289,7 @@ func TestReplicateQueue(t *testing.T) {
 			store, _ := s.Store(testingStore)
 			rq := NewReplicateQueue(
 				store.StoreID(),
+				store.NodeID(),
 				changer,
 				testSettings,
 				s.Allocator(store.StoreID()),

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

@@ -155,7 +155,7 @@ func (src *storeRebalancerControl) checkPendingTicket() (done bool, _ error) {
 }
 
 func (src *storeRebalancerControl) Tick(ctx context.Context, tick time.Time, state state.State) {
-	src.sr.AddLogTag("tick", tick)
+	src.sr.AddLogTag("tick", tick.Sub(src.settings.StartTime))
 	ctx = src.sr.ResetAndAnnotateCtx(ctx)
 	switch src.rebalancerState.phase {
 	case rebalancerSleeping: