Merge #154343

154343: asim: improve comments and test set up for sma r=tbg a=wenyihu6

Epic: CRDB-49117 
Release note: none

---
**asim: move sma and mma to its own folder**

This commit moves sma and mma test data into their own subfolders under testdata
for clearer organization.

---
**asim: add vmodule to tests**

This commit enables vmodule logs by default in asim dd tests.

---
**asim: make RebalancingSnapshotRate configurable**

This commit changes settingsGen.Settings.RebalancingSnapshotRate as a
configurable setting to speed up certain tests.

---
**asim: fix replica state set up string**

Previously, the replica distribution of setup output was inaccurate since it
used target replica and lease count but was not from the actual distribution.
This commit updates the string to reflect the actual distribution.

---
**asim: skip mma tests by default**

This commit skips tests in the mma folder by default since they tend to be
slower, removing the need for skip_under_ci commands.

---
**asim: change store_byte_capacity to *_gib**

This commit changes store_byte_capacity to store_byte_capacity_gib to improve
human readability.

---
**asim: improve assertion output one-off errors**

This commit organizes assertion output to reduce one-off errors - discovered
while testing assertions.

---
**asim: align min key of gen_load and gen_ranges**

Previously, gen_load had a minKey starting at 1, while gen_ranges started at 0.
This commit updates gen_load to start at 0 so both are aligned.

---
**asim: rename multi_store.txt to multi_store_lease.txt**

This commit renames multi_store.txt test to multi_store_lease.txt to reflect
that it asserts on lease balance.

---
**asim: remove load_cluster.txt and zone_config.txt**

This commit remove load_cluster.txt and zone_config.txt tests as they are too
basic and add little value.

---
**asim: fix io_overload**

This test started failing after we fixed the skew distribution, since it relied
on the replica count on store 5 starting and ending at 0. After fixing the skew
distribution, the replica count on store 5 no longer began at 0, even though the
total leases/replica count on s5 didn’t change throughout the test which means
we weren't adding more leases/replicas to the s5. This change updates the test
to force the replica count on store 5 to start at 0 again.

---
**asim: improve comments and test set up for sma**

This commit improves comments and test setup for tests under sma.



Co-authored-by: wenyihu6 <[email protected]>

Author: craig[bot]

pkg/kv/kvserver/asim/assertion/assert.go

@@ -150,12 +150,15 @@ func (sa SteadyStateAssertion) Assert(
 		}
 
 		if sa.Threshold.isViolated(maxMean) || sa.Threshold.isViolated(minMean) || math.IsNaN(maxMean) || math.IsNaN(minMean) {
+			if buf.Len() != 0 {
+				fmt.Fprintf(&buf, "\n")
+			}
 			if holds {
 				fmt.Fprintf(&buf, "  %s\n", sa)
 				holds = false
 			}
 			fmt.Fprintf(&buf,
-				"\tstore=%d min/mean=%.2f max/mean=%.2f\n",
+				"\tstore=%d min/mean=%.2f max/mean=%.2f",
 				i+1, minMean, maxMean)
 		}
 	}
@@ -239,11 +242,14 @@ func (ba BalanceAssertion) Assert(
 			"Balance assertion: stat=%s, max/mean=%.2f, threshold=%+v raw=%v",
 			ba.Stat, maxMeanRatio, ba.Threshold, tickStats)
 		if ba.Threshold.isViolated(maxMeanRatio) {
+			if buf.Len() != 0 {
+				fmt.Fprintf(&buf, "\n")
+			}
 			if holds {
 				fmt.Fprintf(&buf, "  %s\n", ba)
 				holds = false
 			}
-			fmt.Fprintf(&buf, "\tmax/mean=%.2f tick=%d\n", maxMeanRatio, tick)
+			fmt.Fprintf(&buf, "\tmax/mean=%.2f tick=%d", maxMeanRatio, tick)
 		}
 	}
 	return holds, buf.String()
@@ -294,12 +300,15 @@ func (sa StoreStatAssertion) Assert(
 		trimmedStoreStats := statTs[store-1][ticks-sa.Ticks-1:]
 		for _, stat := range trimmedStoreStats {
 			if sa.Threshold.isViolated(stat) {
+				if buf.Len() != 0 {
+					fmt.Fprintf(&buf, "\n")
+				}
 				if holds {
 					holds = false
 					fmt.Fprintf(&buf, "  %s\n", sa)
 				}
 				fmt.Fprintf(&buf,
-					"\tstore=%d stat=%.2f\n",
+					"\tstore=%d stat=%.2f",
 					store, stat)
 			}
 		}
@@ -378,6 +387,9 @@ func (ca ConformanceAssertion) Assert(
 	violatingLeases, lessPrefLeases := len(leaseViolatingPrefs), len(leaseLessPrefs)
 
 	maybeInitHolds := func() {
+		if buf.Len() != 0 {
+			fmt.Fprintf(&buf, "\n")
+		}
 		if holds {
 			holds = false
 			fmt.Fprintf(&buf, "  %s\n", ca)
@@ -473,11 +485,13 @@ func printRangeDesc(r roachpb.RangeDescriptor) string {
 
 func PrintSpanConfigConformanceList(tag string, ranges []roachpb.ConformanceReportedRange) string {
 	var buf strings.Builder
+	buf.WriteString(fmt.Sprintf("%s:\n", tag))
+	if len(ranges) == 0 {
+		buf.WriteString("\t<none>")
+		return buf.String()
+	}
 	for i, r := range ranges {
-		if i == 0 {
-			buf.WriteString(fmt.Sprintf("%s:\n", tag))
-		}
-		buf.WriteString(fmt.Sprintf("  %s applying %s", printRangeDesc(r.RangeDescriptor),
+		buf.WriteString(fmt.Sprintf("\t%s applying %s", printRangeDesc(r.RangeDescriptor),
 			spanconfigtestutils.PrintSpanConfigDiffedAgainstDefaults(r.Config)))
 		if i != len(ranges)-1 {
 			buf.WriteString("\n")

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

@@ -174,7 +174,10 @@ func RangesInfoWithDistribution(
 	targetReplicaCount := make(requestCounts, len(stores))
 	targetLeaseCount := map[StoreID]int{}
 	var buf strings.Builder
-	_, _ = fmt.Fprintf(&buf, "[")
+	storesInfo := make(map[StoreID]struct {
+		replicas int
+		leases   int
+	})
 	for i, store := range stores {
 		requiredReplicas := int(float64(numRanges*rf) * (replicaWeights[i]))
 		requiredLeases := int(float64(numRanges) * (leaseWeights[i]))
@@ -183,13 +186,7 @@ func RangesInfoWithDistribution(
 			id:  int(store),
 		}
 		targetLeaseCount[store] = requiredLeases
-		_, _ = fmt.Fprintf(&buf, "s%d:(%d,%d*)",
-			int(store), requiredReplicas, requiredLeases)
-		if i != len(stores)-1 {
-			_, _ = fmt.Fprintf(&buf, ",")
-		}
 	}
-	_, _ = fmt.Fprintf(&buf, "]")
 
 	// If there are no ranges specified, default to 1 range.
 	if numRanges == 0 {
@@ -228,6 +225,9 @@ func RangesInfoWithDistribution(
 			rangeInfo.Descriptor.InternalReplicas[replCandidateIdx] = roachpb.ReplicaDescriptor{
 				StoreID: roachpb.StoreID(storeID),
 			}
+			storeInfo := storesInfo[storeID]
+			storeInfo.replicas++
+			storesInfo[storeID] = storeInfo
 			if targetLeaseCount[storeID] >
 				targetLeaseCount[StoreID(rangeInfo.Descriptor.InternalReplicas[maxLeaseRequestedIdx].StoreID)] {
 				maxLeaseRequestedIdx = replCandidateIdx
@@ -240,9 +240,22 @@ func RangesInfoWithDistribution(
 		lhStore := rangeInfo.Descriptor.InternalReplicas[maxLeaseRequestedIdx].StoreID
 		targetLeaseCount[StoreID(lhStore)]--
 		rangeInfo.Leaseholder = StoreID(lhStore)
+		storeInfo := storesInfo[StoreID(lhStore)]
+		storeInfo.leases++
+		storesInfo[StoreID(lhStore)] = storeInfo
 		ret[rngIdx] = rangeInfo
 	}
 
+	_, _ = fmt.Fprintf(&buf, "[")
+	for i, sID := range stores {
+		storeInfo := storesInfo[sID]
+		_, _ = fmt.Fprintf(&buf, "s%d:(%d,%d*)", int(sID), storeInfo.replicas, storeInfo.leases)
+		if i != len(stores)-1 {
+			_, _ = fmt.Fprintf(&buf, ",")
+		}
+	}
+	_, _ = fmt.Fprintf(&buf, "]")
+
 	return ret, buf.String()
 }
 

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

@@ -56,6 +56,7 @@ go_test(
         "//pkg/kv/kvserver/kvserverbase",
         "//pkg/kv/kvserver/liveness/livenesspb",
         "//pkg/spanconfig/spanconfigtestutils",
+        "//pkg/testutils",
         "//pkg/testutils/datapathutils",
         "//pkg/testutils/skip",
         "//pkg/testutils/sniffarg",