asim: rename mma-and-count to mma-count

This commit renames mma-and-count to mma-count for consistency with sma-count.

Author: wenyihu6

pkg/kv/kvserver/asim/tests/datadriven_simulation_test.go

@@ -517,7 +517,7 @@ func TestDataDriven(t *testing.T) {
 							})
 					},
 					// Both the replicate/lease queues and the MMA are enabled.
-					"mma-and-count": func(eg *gen.StaticEvents) {
+					"mma-count": func(eg *gen.StaticEvents) {
 						eg.ScheduleEvent(settingsGen.Settings.StartTime, 0,
 							event.SetSimulationSettingsEvent{
 								IsClusterSetting: true,

pkg/kv/kvserver/asim/tests/testdata/non_rand/example_fulldisk.txt

@@ -20,7 +20,7 @@ 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=(sma-count,mma-only,mma-and-count)
+eval duration=30m seed=42 metrics=(replicas,disk_fraction_used) cfgs=(sma-count,mma-only,mma-count)
 ----
 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)
@@ -44,5 +44,5 @@ disk_fraction_used#1: thrash_pct: [s1=37%, s2=35%, s3=37%, s4=33%, s5=174%]  (su
 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=327, s2=326, s3=328, s4=323, s5=196] (stddev=52.03, mean=300.00, sum=1500)
 replicas#1: thrash_pct: [s1=280%, s2=266%, s3=277%, s4=248%, s5=181%]  (sum=1252%)
-artifacts[mma-and-count]: 2a17b81d800bb09
+artifacts[mma-count]: 2a17b81d800bb09
 ==========================

pkg/kv/kvserver/asim/tests/testdata/non_rand/example_skewed_cpu_even_ranges_mma.txt

@@ -34,7 +34,7 @@ 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-count,mma-only,mma-and-count) metrics=(cpu,cpu_util,leases,replicas,write_bytes_per_second)
+eval duration=35m samples=1 seed=42 cfgs=(sma-count,mma-only,mma-count) metrics=(cpu,cpu_util,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)
 cpu#1: thrash_pct: [s1=14%, s2=49%, s3=47%, s4=9%, s5=9%, s6=11%, s7=4%, s8=14%, s9=25%]  (sum=182%)
@@ -76,5 +76,5 @@ replicas#1: last:  [s1=36, s2=34, s3=36, s4=37, s5=36, s6=36, s7=37, s8=36, s9=3
 replicas#1: thrash_pct: [s1=150%, s2=455%, s3=325%, s4=127%, s5=125%, s6=150%, s7=352%, s8=150%, s9=150%]  (sum=1985%)
 write_bytes_per_second#1: last:  [s1=5194, s2=5256, s3=5415, s4=6318, s5=6216, s6=6171, s7=6283, s8=6298, s9=6257] (stddev=461.69, mean=5934.22, sum=53408)
 write_bytes_per_second#1: thrash_pct: [s1=1721%, s2=1566%, s3=1458%, s4=714%, s5=542%, s6=570%, s7=1227%, s8=694%, s9=803%]  (sum=9293%)
-artifacts[mma-and-count]: 9acfd49d51ee3d3c
+artifacts[mma-count]: 9acfd49d51ee3d3c
 ==========================

pkg/kv/kvserver/asim/tests/testdata/non_rand/mma_high_write_uniform_cpu.txt

@@ -24,7 +24,7 @@ gen_load rate=20000 rw_ratio=0 min_block=1000 max_block=1000 min_key=10001 max_k
 setting split_queue_enabled=false
 ----
 
-eval duration=20m samples=1 seed=42 cfgs=(mma-only,mma-and-count) metrics=(cpu,cpu_util,write_bytes_per_second,replicas,leases)
+eval duration=20m samples=1 seed=42 cfgs=(mma-only,mma-count) metrics=(cpu,cpu_util,write_bytes_per_second,replicas,leases)
 ----
 cpu#1: last:  [s1=501095833, s2=496283333, s3=501825000, s4=499525000, s5=499191666, s6=496991666, s7=497529166, s8=505645833, s9=500662500, s10=501250000] (stddev=2612585.85, mean=499999999.70, sum=4999999997)
 cpu#1: thrash_pct: [s1=462%, s2=503%, s3=518%, s4=521%, s5=478%, s6=550%, s7=472%, s8=510%, s9=542%, s10=507%]  (sum=5065%)
@@ -52,5 +52,5 @@ replicas#1: last:  [s1=18, s2=19, s3=17, s4=19, s5=18, s6=20, s7=19, s8=18, s9=1
 replicas#1: thrash_pct: [s1=334%, s2=380%, s3=504%, s4=495%, s5=461%, s6=448%, s7=441%, s8=355%, s9=483%, s10=631%]  (sum=4533%)
 write_bytes_per_second#1: last:  [s1=5991517, s2=6652128, s3=5319444, s4=5324160, s5=7335137, s6=7317906, s7=6667627, s8=5984321, s9=4661370, s10=4656727] (stddev=943727.00, mean=5991033.70, sum=59910337)
 write_bytes_per_second#1: thrash_pct: [s1=293%, s2=380%, s3=548%, s4=507%, s5=414%, s6=424%, s7=394%, s8=416%, s9=420%, s10=493%]  (sum=4288%)
-artifacts[mma-and-count]: dc361f0c11e98b72
+artifacts[mma-count]: dc361f0c11e98b72
 ==========================

pkg/kv/kvserver/asim/tests/testdata/non_rand/mma_skewed_cpu_skewed_write.txt

@@ -35,7 +35,7 @@ gen_load rate=20000 rw_ratio=0 min_block=1000 max_block=1000 raft_cpu_per_write=
 setting split_queue_enabled=false
 ----
 
-eval duration=60m samples=1 seed=42 cfgs=(mma-only,mma-and-count) metrics=(cpu,cpu_util,write_bytes_per_second,replicas,leases) full=true
+eval duration=60m samples=1 seed=42 cfgs=(mma-only,mma-count) metrics=(cpu,cpu_util,write_bytes_per_second,replicas,leases) full=true
 ----
 cpu#1: last:  [s1=832615034, s2=830099242, s3=833159174, s4=830633175, s5=843839094, s6=831645833] (stddev=4670012.58, mean=833665258.67, sum=5001991552)
 cpu#1: thrash_pct: [s1=9%, s2=38%, s3=55%, s4=24%, s5=17%, s6=16%]  (sum=160%)
@@ -63,7 +63,7 @@ replicas#1: last:  [s1=35, s2=36, s3=35, s4=37, s5=37, s6=36] (stddev=0.82, mean
 replicas#1: thrash_pct: [s1=418%, s2=417%, s3=518%, s4=368%, s5=352%, s6=333%]  (sum=2407%)
 write_bytes_per_second#1: last:  [s1=10029554, s2=9475135, s3=9474543, s4=9976329, s5=10530498, s6=10530099] (stddev=431163.47, mean=10002693.00, sum=60016158)
 write_bytes_per_second#1: thrash_pct: [s1=57%, s2=62%, s3=69%, s4=216%, s5=203%, s6=180%]  (sum=787%)
-artifacts[mma-and-count]: 7db51f72e3606b0d
+artifacts[mma-count]: 7db51f72e3606b0d
 ==========================
 Cluster Set Up
 	n1(AU_EAST,AU_EAST_1,5vcpu): {s1:(256GiB)}