asim: rename sma-only to sma-count and remove default

wenyihu6 · wenyihu6 · commit 4ec2d66c5bab · 2025-09-16T11:43:58.000-04:00
This commit renames sma-only to sma-count specify that it enables single-metric
store rebalancer and count-based rebalancing. It also removes default since it
is unclear what it was intended for and does the same thing as sma-count now.
diff --git a/pkg/kv/kvserver/asim/tests/datadriven_simulation_test.go b/pkg/kv/kvserver/asim/tests/datadriven_simulation_test.go
@@ -463,7 +463,7 @@ func TestDataDriven(t *testing.T) {
 				if len(cfgs) == 0 {
 					// TODO(tbg): force each test to specify the configs it wants to run
 					// under.
-					cfgs = []string{"default"}
+					cfgs = []string{"sma-count"}
 				}
 
 				metricsMap := map[string]struct{}{}
@@ -475,9 +475,7 @@ func TestDataDriven(t *testing.T) {
 				require.NotZero(t, rangeGen)
 
 				knownConfigurations := map[string]func(eg *gen.StaticEvents){
-					// In default mode, the test manages its rebalancer-related settings
-					// manually.
-					"default": func(eg *gen.StaticEvents) {
+					"sma-count": func(eg *gen.StaticEvents) {
 						eg.ScheduleEvent(settingsGen.Settings.StartTime, 0,
 							event.SetSimulationSettingsEvent{
 								IsClusterSetting: true,
@@ -487,14 +485,6 @@ func TestDataDriven(t *testing.T) {
 					},
 					// 'mma-only' runs with the multi-metric allocator and turns off the
 					// replicate and lease queues.
-					"sma-only": func(eg *gen.StaticEvents) {
-						eg.ScheduleEvent(settingsGen.Settings.StartTime, 0,
-							event.SetSimulationSettingsEvent{
-								IsClusterSetting: true,
-								Key:              "LBRebalancingMode",
-								Value:            int64(kvserverbase.LBRebalancingLeasesAndReplicas),
-							})
-					},
 					"mma-only": func(eg *gen.StaticEvents) {
 						eg.ScheduleEvent(settingsGen.Settings.StartTime, 0,
 							event.SetSimulationSettingsEvent{
diff --git a/pkg/kv/kvserver/asim/tests/testdata/generated/example_rebalancing/example_rebalancing_sma-count_1.json b/pkg/kv/kvserver/asim/tests/testdata/generated/example_rebalancing/example_rebalancing_sma-count_1.json
diff --git a/pkg/kv/kvserver/asim/tests/testdata/generated/example_rebalancing/example_rebalancing_sma-count_1_topology.txt b/pkg/kv/kvserver/asim/tests/testdata/generated/example_rebalancing/example_rebalancing_sma-count_1_topology.txt
diff --git a/pkg/kv/kvserver/asim/tests/testdata/generated/example_rebalancing/example_rebalancing_sma-count_2.json b/pkg/kv/kvserver/asim/tests/testdata/generated/example_rebalancing/example_rebalancing_sma-count_2.json
diff --git a/pkg/kv/kvserver/asim/tests/testdata/generated/example_rebalancing/example_rebalancing_sma-count_2_topology.txt b/pkg/kv/kvserver/asim/tests/testdata/generated/example_rebalancing/example_rebalancing_sma-count_2_topology.txt
diff --git a/pkg/kv/kvserver/asim/tests/testdata/non_rand/decommission_conformance.txt b/pkg/kv/kvserver/asim/tests/testdata/non_rand/decommission_conformance.txt
@@ -26,7 +26,7 @@ set_liveness node=4 liveness=decommissioning delay=5m
 assertion type=conformance under=0 over=0 unavailable=0 violating=0
 ----
 
-eval duration=20m cfgs=(default,mma-only)
+eval duration=20m cfgs=(sma-count,mma-only)
 ----
-artifacts[default]: 1375509107ab02af
+artifacts[sma-count]: 1375509107ab02af
 artifacts[mma-only]: 398e8cd95b3327fb
diff --git a/pkg/kv/kvserver/asim/tests/testdata/non_rand/example_add_node.txt b/pkg/kv/kvserver/asim/tests/testdata/non_rand/example_add_node.txt
@@ -33,7 +33,7 @@ eval duration=20m samples=1 seed=42 metrics=(replicas)
 ----
 replicas#1: first: [s1=301, s2=0, s3=0] (stddev=141.89, mean=100.33, sum=301)
 replicas#1: last:  [s1=301, s2=271, s3=267] (stddev=15.17, mean=279.67, sum=839)
-artifacts[default]: 866426beb5ad043b
+artifacts[sma-count]: 866426beb5ad043b
 failed assertion sample 1
   balance stat=replicas threshold=(<1.05) ticks=6
 	max/mean=1.08 tick=0
diff --git a/pkg/kv/kvserver/asim/tests/testdata/non_rand/example_conformance.txt b/pkg/kv/kvserver/asim/tests/testdata/non_rand/example_conformance.txt
@@ -26,7 +26,7 @@ set_span_config delay=5m
 assertion type=conformance under=0 over=0 unavailable=0 violating=0
 ----
 
-eval duration=10m cfgs=(default,mma-only)
+eval duration=10m cfgs=(sma-count,mma-only)
 ----
-artifacts[default]: ca2c6e7399a9dc9c
+artifacts[sma-count]: ca2c6e7399a9dc9c
 artifacts[mma-only]: 273dc0cd62dfba6c
diff --git a/pkg/kv/kvserver/asim/tests/testdata/non_rand/example_fulldisk.txt b/pkg/kv/kvserver/asim/tests/testdata/non_rand/example_fulldisk.txt
@@ -20,13 +20,13 @@ set_capacity store=5 capacity=107374182400
 # We will repeatedly hit the disk fullness threshold which causes shedding
 # replicas on store 5. We should see s5 hovering right around 92.5-95%
 # (the storage capacity threshold value).
-eval duration=30m seed=42 metrics=(replicas,disk_fraction_used) cfgs=(default,mma-only)
+eval duration=30m seed=42 metrics=(replicas,disk_fraction_used) cfgs=(sma-count,mma-only)
 ----
 disk_fraction_used#1: first: [s1=0.20, s2=0.20, s3=0.20, s4=0.20, s5=1.05] (stddev=0.34, mean=0.37, sum=2)
 disk_fraction_used#1: last:  [s1=0.30, s2=0.30, s3=0.30, s4=0.30, s5=0.95] (stddev=0.26, mean=0.43, sum=2)
 replicas#1: first: [s1=300, s2=300, s3=300, s4=300, s5=300] (stddev=0.00, mean=300.00, sum=1500)
 replicas#1: last:  [s1=322, s2=328, s3=327, s4=323, s5=200] (stddev=50.05, mean=300.00, sum=1500)
-artifacts[default]: 686ff7227dd03ade
+artifacts[sma-count]: 686ff7227dd03ade
 disk_fraction_used#1: first: [s1=0.20, s2=0.20, s3=0.20, s4=0.20, s5=1.05] (stddev=0.34, mean=0.37, sum=2)
 disk_fraction_used#1: last:  [s1=0.31, s2=0.31, s3=0.31, s4=0.29, s5=0.92] (stddev=0.25, mean=0.43, sum=2)
 replicas#1: first: [s1=300, s2=300, s3=300, s4=300, s5=300] (stddev=0.00, mean=300.00, sum=1500)
diff --git a/pkg/kv/kvserver/asim/tests/testdata/non_rand/example_io_overload.txt b/pkg/kv/kvserver/asim/tests/testdata/non_rand/example_io_overload.txt
@@ -14,13 +14,13 @@ set_capacity store=5 io_threshold=1
 assertion type=stat stat=replicas stores=(5) exact_bound=0 ticks=5
 ----
 
-eval duration=10m seed=42 metrics=(replicas,leases) cfgs=(default,mma-only)
+eval duration=10m seed=42 metrics=(replicas,leases) cfgs=(sma-count,mma-only)
 ----
 leases#1: first: [s1=259, s2=129, s3=64, s4=32, s5=16] (stddev=88.43, mean=100.00, sum=500)
 leases#1: last:  [s1=180, s2=102, s3=106, s4=106, s5=6] (stddev=55.34, mean=100.00, sum=500)
 replicas#1: first: [s1=500, s2=456, s3=262, s4=165, s5=117] (stddev=153.29, mean=300.00, sum=1500)
 replicas#1: last:  [s1=347, s2=343, s3=348, s4=345, s5=117] (stddev=91.52, mean=300.00, sum=1500)
-artifacts[default]: 6574ebfbb518515a
+artifacts[sma-count]: 6574ebfbb518515a
 failed assertion sample 1
   stat=replicas value=(=0.00) ticks=5
 	store=5 stat=117.00
diff --git a/pkg/kv/kvserver/asim/tests/testdata/non_rand/example_lease_preferences.txt b/pkg/kv/kvserver/asim/tests/testdata/non_rand/example_lease_preferences.txt
@@ -28,7 +28,7 @@ set_span_config
 assertion type=conformance lease-violating=1 lease-less-preferred=1
 ----
 
-eval duration=10m cfgs=(default,mma-only)
+eval duration=10m cfgs=(sma-count,mma-only)
 ----
-artifacts[default]: aff3a3eeb0838864
+artifacts[sma-count]: aff3a3eeb0838864
 artifacts[mma-only]: feb445a342bb08e4
diff --git a/pkg/kv/kvserver/asim/tests/testdata/non_rand/example_liveness.txt b/pkg/kv/kvserver/asim/tests/testdata/non_rand/example_liveness.txt
@@ -32,13 +32,13 @@ assertion type=stat stat=replicas ticks=6 exact_bound=0 stores=(6,7)
 # node(store) (n6) to begin losing replicas in a similar manner.
 # Both nodes should begin losing leases immediately after their liveness status
 # is changed to dead or decommissioning (5 minutes later).
-eval duration=12m seed=42 metrics=(replicas,leases) cfgs=(default,mma-only)
+eval duration=12m seed=42 metrics=(replicas,leases) cfgs=(sma-count,mma-only)
 ----
 leases#1: first: [s1=100, s2=100, s3=100, s4=100, s5=100, s6=100, s7=100] (stddev=0.00, mean=100.00, sum=700)
 leases#1: last:  [s1=134, s2=142, s3=143, s4=139, s5=142, s6=0, s7=0] (stddev=63.31, mean=100.00, sum=700)
 replicas#1: first: [s1=300, s2=300, s3=300, s4=300, s5=300, s6=300, s7=300] (stddev=0.00, mean=300.00, sum=2100)
 replicas#1: last:  [s1=432, s2=415, s3=420, s4=418, s5=415, s6=0, s7=0] (stddev=189.81, mean=300.00, sum=2100)
-artifacts[default]: f89c455c9a1b50c9
+artifacts[sma-count]: f89c455c9a1b50c9
 leases#1: first: [s1=100, s2=100, s3=100, s4=100, s5=100, s6=100, s7=100] (stddev=0.00, mean=100.00, sum=700)
 leases#1: last:  [s1=134, s2=139, s3=140, s4=151, s5=136, s6=0, s7=0] (stddev=63.44, mean=100.00, sum=700)
 replicas#1: first: [s1=300, s2=300, s3=300, s4=300, s5=300, s6=300, s7=300] (stddev=0.00, mean=300.00, sum=2100)
diff --git a/pkg/kv/kvserver/asim/tests/testdata/non_rand/example_load_cluster.txt b/pkg/kv/kvserver/asim/tests/testdata/non_rand/example_load_cluster.txt
@@ -20,7 +20,7 @@ set_span_config
 assertion type=conformance unavailable=0 under=0 over=0  violating=0
 ----
 
-eval duration=2m samples=1 seed=42 cfgs=(default,mma-only)
+eval duration=2m samples=1 seed=42 cfgs=(sma-count,mma-only)
 ----
-artifacts[default]: 33ad9dff027a296a
+artifacts[sma-count]: 33ad9dff027a296a
 artifacts[mma-only]: 33ad9dff027a296a
diff --git a/pkg/kv/kvserver/asim/tests/testdata/non_rand/example_multi_store.txt b/pkg/kv/kvserver/asim/tests/testdata/non_rand/example_multi_store.txt
@@ -17,11 +17,11 @@ assertion stat=leases type=balance ticks=6 upper_bound=1
 assertion stat=leases type=steady ticks=6 upper_bound=0
 ----
 
-eval duration=5m seed=42 metrics=(leases) cfgs=(default,mma-only)
+eval duration=5m seed=42 metrics=(leases) cfgs=(sma-count,mma-only)
 ----
 leases#1: first: [s1=8, s2=3, s3=0, s4=0, s5=0, s6=0, s7=0, s8=0, s9=1, s10=0, s11=1, s12=0, s13=1, s14=0] (stddev=2.10, mean=1.00, sum=14)
 leases#1: last:  [s1=1, s2=1, s3=1, s4=1, s5=1, s6=1, s7=1, s8=1, s9=1, s10=1, s11=1, s12=1, s13=1, s14=1] (stddev=0.00, mean=1.00, sum=14)
-artifacts[default]: a7d052306059b056
+artifacts[sma-count]: a7d052306059b056
 leases#1: first: [s1=8, s2=3, s3=0, s4=0, s5=0, s6=0, s7=0, s8=0, s9=1, s10=0, s11=1, s12=0, s13=1, s14=0] (stddev=2.10, mean=1.00, sum=14)
 leases#1: last:  [s1=4, s2=1, s3=0, s4=0, s5=0, s6=1, s7=0, s8=0, s9=1, s10=1, s11=1, s12=1, s13=2, s14=2] (stddev=1.07, mean=1.00, sum=14)
 artifacts[mma-only]: 3c31149bdddfe022
diff --git a/pkg/kv/kvserver/asim/tests/testdata/non_rand/example_rebalancing.txt b/pkg/kv/kvserver/asim/tests/testdata/non_rand/example_rebalancing.txt
@@ -37,13 +37,13 @@ assertion stat=qps type=steady ticks=6 upper_bound=0.05
 # Following the evaluation, the samples are checked individually against the
 # existing assertions, added above. If any assertion fails, the reason is
 # printed. If no assertions fail, then OK is printed.
-eval duration=3m samples=2 seed=42 metrics=(qps,replica_moves) cfgs=(default,mma-only)
+eval duration=3m samples=2 seed=42 metrics=(qps,replica_moves) cfgs=(sma-count,mma-only)
 ----
 qps#1: last:  [s1=998, s2=998, s3=1001, s4=995, s5=998, s6=1002, s7=1001] (stddev=2.27, mean=999.00, sum=6993)
 replica_moves#1: last:  [s1=2, s2=1, s3=0, s4=1, s5=1, s6=1, s7=0] (stddev=0.64, mean=0.86, sum=6)
 qps#2: last:  [s1=996, s2=996, s3=1000, s4=998, s5=1001, s6=1003, s7=1000] (stddev=2.42, mean=999.14, sum=6994)
 replica_moves#2: last:  [s1=2, s2=1, s3=0, s4=0, s5=0, s6=1, s7=0] (stddev=0.73, mean=0.57, sum=4)
-artifacts[default]: 70177cf859633651
+artifacts[sma-count]: 70177cf859633651
 qps#1: last:  [s1=3999, s2=1997, s3=0, s4=0, s5=0, s6=1003, s7=0] (stddev=1413.61, mean=999.86, sum=6999)
 qps#2: last:  [s1=3996, s2=1996, s3=0, s4=0, s5=0, s6=1006, s7=0] (stddev=1412.60, mean=999.71, sum=6998)
 artifacts[mma-only]: c48e80aec15208d6
@@ -77,13 +77,13 @@ setting gossip_delay=20s
 #
 # TODO: Adding StoreGossip.RecordNewPerSecondStats() to asim gossip causes
 # thrashing on the fourth sample here.
-eval duration=5m samples=2 seed=42 metrics=(qps,replica_moves) cfgs=(default,mma-only)
+eval duration=5m samples=2 seed=42 metrics=(qps,replica_moves) cfgs=(sma-count,mma-only)
 ----
 qps#1: last:  [s1=994, s2=1004, s3=1002, s4=1002, s5=1000, s6=997, s7=999] (stddev=3.15, mean=999.71, sum=6998)
 replica_moves#1: last:  [s1=6, s2=4, s3=0, s4=1, s5=3, s6=5, s7=2] (stddev=2.00, mean=3.00, sum=21)
 qps#2: last:  [s1=999, s2=998, s3=998, s4=998, s5=1000, s6=999, s7=1003] (stddev=1.67, mean=999.29, sum=6995)
 replica_moves#2: last:  [s1=15, s2=13, s3=5, s4=3, s5=10, s6=9, s7=8] (stddev=3.89, mean=9.00, sum=63)
-artifacts[default]: 430366c9c84f1c07
+artifacts[sma-count]: 430366c9c84f1c07
 qps#1: last:  [s1=3995, s2=1998, s3=0, s4=0, s5=0, s6=1005, s7=0] (stddev=1412.50, mean=999.71, sum=6998)
 qps#2: last:  [s1=4000, s2=1995, s3=0, s4=0, s5=0, s6=1004, s7=0] (stddev=1413.71, mean=999.86, sum=6999)
 artifacts[mma-only]: fc6f065395b9a390
diff --git a/pkg/kv/kvserver/asim/tests/testdata/non_rand/example_skewed_cpu_even_ranges_mma.txt b/pkg/kv/kvserver/asim/tests/testdata/non_rand/example_skewed_cpu_even_ranges_mma.txt
@@ -34,15 +34,15 @@ setting split_queue_enabled=false
 # TODO(tbg): it's interesting that sma-only does better on write throughput than
 # mma-only. Looking at the graphs, the mma-only flavor is much slower in moving
 # load around. Possibly a bug?
-eval duration=35m samples=1 seed=42 cfgs=(sma-only,mma-only,mma-and-count) metrics=(cpu,leases,replicas,write_bytes_per_second)
+eval duration=35m samples=1 seed=42 cfgs=(sma-count,mma-only,mma-and-count) metrics=(cpu,leases,replicas,write_bytes_per_second)
 ----
 cpu#1: last:  [s1=984642922, s2=1126669982, s3=703798726, s4=419425213, s5=432156047, s6=559114683, s7=142318086, s8=283346689, s9=424209084] (stddev=303225920.55, mean=563964603.56, sum=5075681432)
 leases#1: first: [s1=36, s2=0, s3=0, s4=36, s5=0, s6=0, s7=36, s8=0, s9=0] (stddev=16.97, mean=12.00, sum=108)
 leases#1: last:  [s1=13, s2=12, s3=12, s4=17, s5=11, s6=9, s7=15, s8=10, s9=9] (stddev=2.54, mean=12.00, sum=108)
 replicas#1: first: [s1=36, s2=36, s3=36, s4=36, s5=36, s6=36, s7=36, s8=36, s9=36] (stddev=0.00, mean=36.00, sum=324)
 replicas#1: last:  [s1=36, s2=37, s3=33, s4=37, s5=36, s6=36, s7=36, s8=35, s9=38] (stddev=1.33, mean=36.00, sum=324)
 write_bytes_per_second#1: last:  [s1=5619, s2=5639, s3=5275, s4=6269, s5=6137, s6=6150, s7=6187, s8=5861, s9=6290] (stddev=336.10, mean=5936.33, sum=53427)
-artifacts[sma-only]: 6f86408eff3edb14
+artifacts[sma-count]: 6f86408eff3edb14
 cpu#1: last:  [s1=572909386, s2=573979147, s3=572126524, s4=557253107, s5=557048324, s6=558469521, s7=571735501, s8=555522023, s9=554214626] (stddev=8138152.97, mean=563695351.00, sum=5073258159)
 leases#1: first: [s1=36, s2=0, s3=0, s4=36, s5=0, s6=0, s7=36, s8=0, s9=0] (stddev=16.97, mean=12.00, sum=108)
 leases#1: last:  [s1=4, s2=4, s3=4, s4=40, s5=4, s6=4, s7=40, s8=4, s9=4] (stddev=14.97, mean=12.00, sum=108)
diff --git a/pkg/kv/kvserver/asim/tests/testdata/non_rand/example_splitting.txt b/pkg/kv/kvserver/asim/tests/testdata/non_rand/example_splitting.txt
@@ -27,13 +27,13 @@ assertion stat=replicas type=steady ticks=6 upper_bound=0.00
 # Examine the number of replicas. Here there were 5 load based splits. This
 # roughly lines up with expectations, given a rate of 10,000 QPS and 2,500 QPS
 # split threshold.
-eval duration=5m samples=2 seed=42 metrics=(replicas) cfgs=(default,mma-only)
+eval duration=5m samples=2 seed=42 metrics=(replicas) cfgs=(sma-count,mma-only)
 ----
 replicas#1: first: [s1=1] (stddev=0.00, mean=1.00, sum=1)
 replicas#1: last:  [s1=6] (stddev=0.00, mean=6.00, sum=6)
 replicas#2: first: [s1=1] (stddev=0.00, mean=1.00, sum=1)
 replicas#2: last:  [s1=6] (stddev=0.00, mean=6.00, sum=6)
-artifacts[default]: e827ff169690da40
+artifacts[sma-count]: e827ff169690da40
 replicas#1: first: [s1=1] (stddev=0.00, mean=1.00, sum=1)
 replicas#1: last:  [s1=6] (stddev=0.00, mean=6.00, sum=6)
 replicas#2: first: [s1=1] (stddev=0.00, mean=1.00, sum=1)
@@ -48,13 +48,13 @@ artifacts[mma-only]: 87a98d4c0bdb6484
 gen_load rate=10000 rw_ratio=1.0 access_skew=true replace=true
 ----
 
-eval duration=5m samples=2 seed=42 metrics=(replicas) cfgs=(default,mma-only)
+eval duration=5m samples=2 seed=42 metrics=(replicas) cfgs=(sma-count,mma-only)
 ----
 replicas#1: first: [s1=1] (stddev=0.00, mean=1.00, sum=1)
 replicas#1: last:  [s1=9] (stddev=0.00, mean=9.00, sum=9)
 replicas#2: first: [s1=1] (stddev=0.00, mean=1.00, sum=1)
 replicas#2: last:  [s1=9] (stddev=0.00, mean=9.00, sum=9)
-artifacts[default]: c87fad367527e848
+artifacts[sma-count]: c87fad367527e848
 replicas#1: first: [s1=1] (stddev=0.00, mean=1.00, sum=1)
 replicas#1: last:  [s1=10] (stddev=0.00, mean=10.00, sum=10)
 replicas#2: first: [s1=1] (stddev=0.00, mean=1.00, sum=1)
diff --git a/pkg/kv/kvserver/asim/tests/testdata/non_rand/example_zone_config.txt b/pkg/kv/kvserver/asim/tests/testdata/non_rand/example_zone_config.txt
@@ -25,11 +25,11 @@ gen_ranges ranges=200
 assertion type=stat stat=replicas ticks=5 exact_bound=0 stores=(13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30)
 ----
 
-eval duration=10m samples=1 seed=42 metrics=(replicas) cfgs=(default,mma-only)
+eval duration=10m samples=1 seed=42 metrics=(replicas) cfgs=(sma-count,mma-only)
 ----
 replicas#1: first: [s1=17, s2=17, s3=17, s4=17, s5=17, s6=16, s7=16, s8=17, s9=17, s10=17, s11=17, s12=17, s13=16, s14=16, s15=16, s16=16, s17=17, s18=17, s19=17, s20=16, s21=17, s22=16, s23=17, s24=17, s25=17, s26=17, s27=17, s28=16, s29=17, s30=16, s31=17, s32=17, s33=16, s34=16, s35=17, s36=17] (stddev=0.47, mean=16.67, sum=600)
 replicas#1: last:  [s1=51, s2=50, s3=52, s4=51, s5=49, s6=49, s7=50, s8=49, s9=49, s10=50, s11=48, s12=52, s13=0, s14=0, s15=0, s16=0, s17=0, s18=0, s19=0, s20=0, s21=0, s22=0, s23=0, s24=0, s25=0, s26=0, s27=0, s28=0, s29=0, s30=0, s31=0, s32=0, s33=0, s34=0, s35=0, s36=0] (stddev=23.58, mean=16.67, sum=600)
-artifacts[default]: 48fc2e7a0c77951b
+artifacts[sma-count]: 48fc2e7a0c77951b
 replicas#1: first: [s1=17, s2=17, s3=17, s4=17, s5=17, s6=16, s7=16, s8=17, s9=17, s10=17, s11=17, s12=17, s13=16, s14=16, s15=16, s16=16, s17=17, s18=17, s19=17, s20=16, s21=17, s22=16, s23=17, s24=17, s25=17, s26=17, s27=17, s28=16, s29=17, s30=16, s31=17, s32=17, s33=16, s34=16, s35=17, s36=17] (stddev=0.47, mean=16.67, sum=600)
 replicas#1: last:  [s1=66, s2=37, s3=42, s4=40, s5=45, s6=50, s7=38, s8=47, s9=62, s10=60, s11=61, s12=52, s13=0, s14=0, s15=0, s16=0, s17=0, s18=0, s19=0, s20=0, s21=0, s22=0, s23=0, s24=0, s25=0, s26=0, s27=0, s28=0, s29=0, s30=0, s31=0, s32=0, s33=0, s34=0, s35=0, s36=0] (stddev=24.23, mean=16.67, sum=600)
 artifacts[mma-only]: 3d0f72b243e941f1
diff --git a/pkg/kv/kvserver/asim/tests/testdata/non_rand/load_distribution_movement_disabled_enable_later.txt b/pkg/kv/kvserver/asim/tests/testdata/non_rand/load_distribution_movement_disabled_enable_later.txt
@@ -42,12 +42,12 @@ gen_load rate=10000 rw_ratio=0 min_block=1000 max_block=1000 min_key=10001 max_k
 setting rebalance_mode=4 delay=2m
 ----
 
-eval duration=7m samples=1 seed=42 cfgs=(sma-only) metrics=(cpu,write_bytes_per_second,replicas,leases)
+eval duration=7m samples=1 seed=42 cfgs=(sma-count) metrics=(cpu,write_bytes_per_second,replicas,leases)
 ----
 cpu#1: last:  [s1=451007155, s2=424066775, s3=481923720, s4=487552810, s5=432089126, s6=536127090, s7=582915883, s8=497226435, s9=545078443, s10=559276708] (stddev=51954473.68, mean=499726414.50, sum=4997264145)
 leases#1: first: [s1=6, s2=6, s3=6, s4=6, s5=6, s6=6, s7=6, s8=6, s9=6, s10=6] (stddev=0.00, mean=6.00, sum=60)
 leases#1: last:  [s1=54, s2=56, s3=55, s4=53, s5=57, s6=58, s7=60, s8=57, s9=60, s10=61] (stddev=2.55, mean=57.10, sum=571)
 replicas#1: first: [s1=18, s2=18, s3=18, s4=18, s5=18, s6=18, s7=18, s8=18, s9=18, s10=18] (stddev=0.00, mean=18.00, sum=180)
 replicas#1: last:  [s1=175, s2=172, s3=179, s4=173, s5=173, s6=174, s7=167, s8=169, s9=169, s10=162] (stddev=4.50, mean=171.30, sum=1713)
 write_bytes_per_second#1: last:  [s1=2994621, s2=2991747, s3=3008247, s4=2988902, s5=3006699, s6=2993336, s7=2993993, s8=3002728, s9=2996629, s10=2997216] (stddev=6108.70, mean=2997411.80, sum=29974118)
-artifacts[sma-only]: 70a15957c8cfc487
+artifacts[sma-count]: 70a15957c8cfc487
diff --git a/pkg/kv/kvserver/asim/tests/testdata/non_rand/mma_constraint_satisfaction2.txt b/pkg/kv/kvserver/asim/tests/testdata/non_rand/mma_constraint_satisfaction2.txt
@@ -23,11 +23,11 @@ gen_ranges ranges=9 repl_factor=5 placement_type=replica_placement
 {s1:*,s3,s4,s6,s9}:1
 
 
-eval duration=30m samples=1 seed=42 metrics=(replicas) cfgs=(default,mma-only)
+eval duration=30m samples=1 seed=42 metrics=(replicas) cfgs=(sma-count,mma-only)
 ----
 replicas#1: first: [s1=6, s2=6, s3=6, s4=6, s5=6, s6=6, s7=3, s8=3, s9=3] (stddev=1.41, mean=5.00, sum=45)
 replicas#1: last:  [s1=6, s2=6, s3=6, s4=6, s5=6, s6=6, s7=3, s8=3, s9=3] (stddev=1.41, mean=5.00, sum=45)
-artifacts[default]: 36e2a4ffe85a04c2
+artifacts[sma-count]: 36e2a4ffe85a04c2
 replicas#1: first: [s1=6, s2=6, s3=6, s4=6, s5=6, s6=6, s7=3, s8=3, s9=3] (stddev=1.41, mean=5.00, sum=45)
 replicas#1: last:  [s1=6, s2=6, s3=6, s4=6, s5=6, s6=6, s7=3, s8=3, s9=3] (stddev=1.41, mean=5.00, sum=45)
 artifacts[mma-only]: 36e2a4ffe85a04c2
diff --git a/pkg/kv/kvserver/asim/tests/testdata/non_rand/mma_constraint_satisfaction_old_alloc.txt b/pkg/kv/kvserver/asim/tests/testdata/non_rand/mma_constraint_satisfaction_old_alloc.txt
@@ -26,14 +26,14 @@ set_span_config
 [0,9999999999): num_replicas=5 num_voters=5 constraints={'+region=a':2,'+region=b':2,'+region=c':1} lease_preferences=[['+region=a']]
 ----
 
-eval duration=60m samples=1 seed=42 metrics=(cpu,leases,replicas) cfgs=(default,mma-only)
+eval duration=60m samples=1 seed=42 metrics=(cpu,leases,replicas) cfgs=(sma-count,mma-only)
 ----
 cpu#1: last:  [s1=41374276, s2=27297814, s3=32347286, s4=499562, s5=499562, s6=499562, s7=0, s8=0, s9=0] (stddev=16111846.58, mean=11390895.78, sum=102518062)
 leases#1: first: [s1=100, s2=0, s3=0, s4=0, s5=0, s6=0, s7=0, s8=0, s9=0] (stddev=31.43, mean=11.11, sum=100)
 leases#1: last:  [s1=41, s2=27, s3=32, s4=0, s5=0, s6=0, s7=0, s8=0, s9=0] (stddev=16.07, mean=11.11, sum=100)
 replicas#1: first: [s1=100, s2=100, s3=0, s4=100, s5=100, s6=100, s7=0, s8=0, s9=0] (stddev=49.69, mean=55.56, sum=500)
 replicas#1: last:  [s1=69, s2=67, s3=64, s4=100, s5=100, s6=100, s7=0, s8=0, s9=0] (stddev=41.59, mean=55.56, sum=500)
-artifacts[default]: 69a8bda9ac7f99aa
+artifacts[sma-count]: 69a8bda9ac7f99aa
 cpu#1: last:  [s1=36336519, s2=33585339, s3=31110149, s4=500211, s5=500211, s6=500211, s7=0, s8=0, s9=0] (stddev=15807188.65, mean=11392515.56, sum=102532640)
 leases#1: first: [s1=100, s2=0, s3=0, s4=0, s5=0, s6=0, s7=0, s8=0, s9=0] (stddev=31.43, mean=11.11, sum=100)
 leases#1: last:  [s1=36, s2=33, s3=31, s4=0, s5=0, s6=0, s7=0, s8=0, s9=0] (stddev=15.76, mean=11.11, sum=100)
diff --git a/pkg/kv/kvserver/asim/tests/testdata/non_rand/one_voter.txt b/pkg/kv/kvserver/asim/tests/testdata/non_rand/one_voter.txt
@@ -6,13 +6,13 @@ gen_cluster nodes=2
 gen_ranges ranges=100 repl_factor=1 placement_type=skewed
 ----
 
-eval duration=20m seed=42 metrics=(replicas,leases) cfgs=(default,mma-only)
+eval duration=20m seed=42 metrics=(replicas,leases) cfgs=(sma-count,mma-only)
 ----
 leases#1: first: [s1=66, s2=34] (stddev=16.00, mean=50.00, sum=100)
 leases#1: last:  [s1=51, s2=49] (stddev=1.00, mean=50.00, sum=100)
 replicas#1: first: [s1=66, s2=34] (stddev=16.00, mean=50.00, sum=100)
 replicas#1: last:  [s1=51, s2=49] (stddev=1.00, mean=50.00, sum=100)
-artifacts[default]: db55b6d407888d3c
+artifacts[sma-count]: db55b6d407888d3c
 leases#1: first: [s1=66, s2=34] (stddev=16.00, mean=50.00, sum=100)
 leases#1: last:  [s1=66, s2=34] (stddev=16.00, mean=50.00, sum=100)
 replicas#1: first: [s1=66, s2=34] (stddev=16.00, mean=50.00, sum=100)
