asim: no longer generate topology.txt

We have the setup output now.

Author: tbg

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

@@ -8,7 +8,6 @@ package tests
 import (
 	"context"
 	"fmt"
-	"hash"
 	"hash/fnv"
 	"math/rand"
 	"os"
@@ -601,9 +600,6 @@ func TestDataDriven(t *testing.T) {
 						for sample, h := range run.hs {
 							printStatsAndGenerateJSON(t, &buf, h, testName, sample+1, plotDir, hasher, rewrite,
 								settingsGen.Settings.TickInterval, metricsMap)
-							generateTopology(t, h,
-								filepath.Join(plotDir, fmt.Sprintf("%s_%d_topology.txt", testName, sample+1)),
-								hasher, rewrite)
 						}
 						artifactsHash := hasher.Sum64()
 
@@ -739,22 +735,6 @@ type modeHistory struct {
 	hs   []history.History
 }
 
-func generateTopology(
-	t *testing.T, h history.History, topFile string, hasher hash.Hash, rewrite bool,
-) {
-	// TODO(tbg): this can in principle be printed without even
-	// evaluating the test, and in particular it's independent of
-	// settings. It seems like an artifact of the implementation
-	// that we can only access the structured topology after the
-	// simulation has run.
-	top := h.S.Topology()
-	s := top.String()
-	_, _ = fmt.Fprint(hasher, s)
-	if rewrite {
-		require.NoError(t, os.WriteFile(topFile, []byte(s), 0644))
-	}
-}
-
 // writeStateStrToFile writes the state string to the given file.
 func writeStateStrToFile(t *testing.T, topFile string, stateStr string, rewrite bool) {
 	if rewrite {

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

@@ -28,7 +28,7 @@ assertion type=conformance under=0 over=0 unavailable=0 violating=0
 
 eval duration=20m cfgs=(sma-count,mma-only)
 ----
-artifacts[sma-count]: 19128202c9e746ab
+artifacts[sma-count]: 8e9d6ada04cb9561
 ==========================
-artifacts[mma-only]: d80019be362b72f7
+artifacts[mma-only]: 239144d63ffded95
 ==========================

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

@@ -34,7 +34,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[sma-count]: 2ec16a0a9e1fe5b1
+artifacts[sma-count]: 58e379d72ddc641d
 failed assertion sample 1
   balance stat=replicas threshold=(≤1.05) ticks=6
 	max/mean=1.08 tick=0

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

@@ -28,7 +28,7 @@ assertion type=conformance under=0 over=0 unavailable=0 violating=0
 
 eval duration=10m cfgs=(sma-count,mma-only)
 ----
-artifacts[sma-count]: 1dc992474ba09e56
+artifacts[sma-count]: 79c6ee6ca7f1ab55
 ==========================
-artifacts[mma-only]: 412f90f16a6ace6
+artifacts[mma-only]: d508ef8005542825
 ==========================

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

@@ -26,11 +26,11 @@ disk_fraction_used#1: first: [s1=0.20, s2=0.20, s3=0.20, s4=0.20, s5=1.05] (stdd
 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[sma-count]: 7dda84c02e3ab35c
+artifacts[sma-count]: f36a73f72b67ff15
 ==========================
 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)
 replicas#1: last:  [s1=331, s2=329, s3=329, s4=316, s5=195] (stddev=52.77, mean=300.00, sum=1500)
-artifacts[mma-only]: a9a389f345c27ce8
+artifacts[mma-only]: 4bbec1a9787ddb71
 ==========================

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

@@ -20,7 +20,7 @@ leases#1: first: [s1=259, s2=129, s3=64, s4=32, s5=16] (stddev=88.43, mean=100.0
 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[sma-count]: 4f034fc902f117cc
+artifacts[sma-count]: 937f126429994d65
 failed assertion sample 1
   stat=replicas value=(=0.00) ticks=5
 	store=5 stat=117.00
@@ -34,7 +34,7 @@ leases#1: first: [s1=259, s2=129, s3=64, s4=32, s5=16] (stddev=88.43, mean=100.0
 leases#1: last:  [s1=259, s2=145, s3=64, s4=32, s5=0] (stddev=92.98, 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=500, s2=456, s3=262, s4=165, s5=117] (stddev=153.29, mean=300.00, sum=1500)
-artifacts[mma-only]: d41a68eee763e550
+artifacts[mma-only]: 752089ccd9817df9
 failed assertion sample 1
   stat=replicas value=(=0.00) ticks=5
 	store=5 stat=117.00

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

@@ -30,7 +30,7 @@ assertion type=conformance lease-violating=1 lease-less-preferred=1
 
 eval duration=10m cfgs=(sma-count,mma-only)
 ----
-artifacts[sma-count]: f66f8f412675b2de
+artifacts[sma-count]: 35051da9f3ec651d
 ==========================
-artifacts[mma-only]: db8ea848a44e08be
+artifacts[mma-only]: 5c6a18fd5194eefd
 ==========================

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

@@ -38,11 +38,11 @@ leases#1: first: [s1=100, s2=100, s3=100, s4=100, s5=100, s6=100, s7=100] (stdde
 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[sma-count]: 6d16cb954b5d867b
+artifacts[sma-count]: 6ea963e52d5dbdcd
 ==========================
 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)
 replicas#1: last:  [s1=431, s2=415, s3=418, s4=419, s5=417, s6=0, s7=0] (stddev=189.80, mean=300.00, sum=2100)
-artifacts[mma-only]: 591e01f5aaa778dd
+artifacts[mma-only]: e00a4da1eb04fbff
 ==========================

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

@@ -22,7 +22,7 @@ assertion type=conformance unavailable=0 under=0 over=0  violating=0
 
 eval duration=2m samples=1 seed=42 cfgs=(sma-count,mma-only)
 ----
-artifacts[sma-count]: b67fd69d442cf866
+artifacts[sma-count]: c2ff48b799d10135
 ==========================
-artifacts[mma-only]: b67fd69d442cf866
+artifacts[mma-only]: c2ff48b799d10135
 ==========================

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

@@ -23,11 +23,11 @@ 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[sma-count]: 9f9efa5941389aaa
+artifacts[sma-count]: 6322c40ff6c7b47c
 ==========================
 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]: 14a2a11dff9326b6
+artifacts[mma-only]: ed1b3ca87bbb8148
 failed assertion sample 1
   balance stat=leases threshold=(≤1.00) ticks=6
 	max/mean=4.00 tick=0