asim: print store info to * _setup.txt

This commit outputs store capacity and store attributes t.o the setup file.

Author: wenyihu6

pkg/kv/kvserver/asim/event/mutation_event.go

@@ -169,7 +169,7 @@ func (sce SetCapacityOverrideEvent) Func() EventFunc {
 }
 
 func (sce SetCapacityOverrideEvent) String() string {
-	return fmt.Sprintf("set capacity override event with storeID=%d, capacity_override=%v", sce.StoreID, sce.CapacityOverride)
+	return fmt.Sprintf("override s%d capacity to %v", sce.StoreID, sce.CapacityOverride)
 }
 
 func (sne SetNodeLocalityEvent) Func() EventFunc {

pkg/kv/kvserver/asim/gen/printer.go

@@ -83,10 +83,7 @@ func generateClusterVisualization(
 		return
 	}
 	_, _ = fmt.Fprintf(buf, "Cluster Set Up\n")
-	for _, n := range s.Nodes() {
-		_, _ = fmt.Fprintf(buf, "%v", n)
-		_, _ = fmt.Fprintf(buf, "\n")
-	}
+	_, _ = fmt.Fprintf(buf, "%v", s.NodesString())
 	_, _ = fmt.Fprintf(buf, "Key Space\n%s", rangeStateStr)
 	_, _ = fmt.Fprintf(buf, "Event\n%s", eventGen.String())
 	_, _ = fmt.Fprintf(buf, "Workload Set Up\n%s", loadGen.String())

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

@@ -1425,6 +1425,44 @@ func (s *state) SetSimulationSettings(Key string, Value interface{}) {
 	}
 }
 
+func (s *state) NodesString() string {
+	var buf strings.Builder
+
+	nodes := make([]*node, 0, len(s.nodes))
+	for _, node := range s.nodes {
+		nodes = append(nodes, node)
+	}
+	slices.SortFunc(nodes, func(a, b *node) int {
+		return cmp.Compare(a.nodeID, b.nodeID)
+	})
+
+	for _, n := range nodes {
+		_, _ = fmt.Fprintf(&buf, "\tn%d(", n.nodeID)
+		for _, locality := range n.desc.Locality.Tiers {
+			_, _ = fmt.Fprintf(&buf, "%s,", locality.Value)
+		}
+		_, _ = fmt.Fprintf(&buf, "%dvcpu): {",
+			n.cpuRateCapacity/time.Second.Nanoseconds())
+		for i, store := range n.Stores() {
+			s, ok := s.Store(store)
+			if ok {
+				attrStr := ""
+				if attrs := s.Descriptor().Attrs; attrs.Size() != 0 {
+					attrStr = fmt.Sprintf("%v,", attrs)
+				}
+				_, _ = fmt.Fprintf(&buf, "s%d:(%s%vGiB)", store, attrStr, s.Descriptor().Capacity.Capacity>>30)
+			} else {
+				_, _ = fmt.Fprintf(&buf, "s%d:notfound", store)
+			}
+			if i < len(n.Stores())-1 {
+				_, _ = fmt.Fprintf(&buf, ",")
+			}
+		}
+		_, _ = fmt.Fprintf(&buf, "}\n")
+	}
+	return buf.String()
+}
+
 // node is an implementation of the Node interface.
 type node struct {
 	nodeID          NodeID
@@ -1437,24 +1475,6 @@ type node struct {
 	as          *mmaintegration.AllocatorSync
 }
 
-func (n *node) String() string {
-	var buf strings.Builder
-	_, _ = fmt.Fprintf(&buf, "\tn%d(", n.nodeID)
-	for _, locality := range n.desc.Locality.Tiers {
-		_, _ = fmt.Fprintf(&buf, "%s,", locality.Value)
-	}
-	_, _ = fmt.Fprintf(&buf, "%dvcpu): {",
-		n.cpuRateCapacity/time.Second.Nanoseconds())
-	for i, s := range n.Stores() {
-		_, _ = fmt.Fprintf(&buf, "s%d", s)
-		if i < len(n.Stores())-1 {
-			_, _ = fmt.Fprintf(&buf, ",")
-		}
-	}
-	_, _ = fmt.Fprintf(&buf, "}")
-	return buf.String()
-}
-
 // NodeID returns the ID of this node.
 func (n *node) NodeID() NodeID {
 	return n.nodeID

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

@@ -63,6 +63,8 @@ type State interface {
 	Node(NodeID) Node
 	// Nodes returns all nodes that exist in this state.
 	Nodes() []Node
+	// NodesString returns a string representation of all nodes.
+	NodesString() string
 	// RangeFor returns the range containing Key in [StartKey, EndKey). This
 	// cannot fail.
 	RangeFor(Key) Range

pkg/kv/kvserver/asim/tests/testdata/generated/example_rebalancing/example_rebalancing_setup.txt

@@ -1,11 +1,11 @@
 Cluster Set Up
-	n1(AU_EAST,AU_EAST_1,8vcpu): {s1}
-	n2(AU_EAST,AU_EAST_1,8vcpu): {s2}
-	n3(AU_EAST,AU_EAST_1,8vcpu): {s3}
-	n4(AU_EAST,AU_EAST_1,8vcpu): {s4}
-	n5(AU_EAST,AU_EAST_1,8vcpu): {s5}
-	n6(AU_EAST,AU_EAST_1,8vcpu): {s6}
-	n7(AU_EAST,AU_EAST_1,8vcpu): {s7}
+	n1(AU_EAST,AU_EAST_1,8vcpu): {s1:(256GiB)}
+	n2(AU_EAST,AU_EAST_1,8vcpu): {s2:(256GiB)}
+	n3(AU_EAST,AU_EAST_1,8vcpu): {s3:(256GiB)}
+	n4(AU_EAST,AU_EAST_1,8vcpu): {s4:(256GiB)}
+	n5(AU_EAST,AU_EAST_1,8vcpu): {s5:(256GiB)}
+	n6(AU_EAST,AU_EAST_1,8vcpu): {s6:(256GiB)}
+	n7(AU_EAST,AU_EAST_1,8vcpu): {s7:(256GiB)}
 Key Space
 	[0,10000): 7(rf=3), 0MiB, [s1:(10,3*),s2:(5,1*),s3:(2,0*),s4:(1,0*),s5:(0,0*),s6:(0,0*),s7:(0,0*)]
 Event