From 720038a9469b41f498489b666c7c3028fb9dd1bd Mon Sep 17 00:00:00 2001
From: Austen McClernon <austen@cockroachlabs.com>
Date: Fri, 25 Oct 2024 17:22:39 -0400
Subject: [PATCH] asim: [dnm] diversity w/ matching prefix

```bash
./dev test pkg/kv/kvserver/asim/tests -v -f TestDataDriven/diversity
```

Epic: none
Release note: None
---
 .../non_rand/diversity_added_matching_prefix  | 111 ++++++++++++++++++
 .../non_rand/diversity_no_matching_prefix     | 110 +++++++++++++++++
 2 files changed, 221 insertions(+)
 create mode 100644 pkg/kv/kvserver/asim/tests/testdata/non_rand/diversity_added_matching_prefix
 create mode 100644 pkg/kv/kvserver/asim/tests/testdata/non_rand/diversity_no_matching_prefix

diff --git a/pkg/kv/kvserver/asim/tests/testdata/non_rand/diversity_added_matching_prefix b/pkg/kv/kvserver/asim/tests/testdata/non_rand/diversity_added_matching_prefix
new file mode 100644
index 000000000000..d3df1a4ed743
--- /dev/null
+++ b/pkg/kv/kvserver/asim/tests/testdata/non_rand/diversity_added_matching_prefix
@@ -0,0 +1,111 @@
+gen_cluster nodes=9
+----
+
+set_locality node=1 locality=country=us,region=aws-west-1,zone=us-west-1a
+----
+
+set_locality node=2 locality=country=us,region=aws-west-1,zone=us-west-1b
+----
+
+set_locality node=3 locality=country=us,region=aws-west-1,zone=us-west-1c
+----
+
+set_locality node=4 locality=country=us,region=aws-west-2,zone=us-west-2a
+----
+
+set_locality node=5 locality=country=us,region=aws-west-2,zone=us-west-2b
+----
+
+set_locality node=6 locality=country=us,region=aws-west-2,zone=us-west-2c
+----
+
+set_locality node=7 locality=country=us,region=aws-east-1,zone=us-east-1a
+----
+
+set_locality node=8 locality=country=us,region=aws-east-1,zone=us-east-1b
+----
+
+set_locality node=9 locality=country=us,region=aws-east-1,zone=us-east-1c
+----
+
+gen_ranges ranges=900 repl_factor=3 placement_skew=true
+----
+
+eval duration=30m seed=42
+----
+OK
+
+plot stat=replicas
+----
+----
+
+ 900 ┼─╮╮
+ 840 ┤ ╰───╮
+ 780 ┤     ╰─╮╮
+ 720 ┤       ╰───╮╮
+ 660 ┤           ╰──╮╮
+ 600 ┤              ╰──╮╮
+ 540 ┤                 ╰───╮
+ 480 ┤                    ╰╰─╮╮
+ 420 ┤                       ╰───╮
+ 360 ┤                           ╰───╮
+ 300 ┤                            ╭──────────────────────────────────────────────────
+ 240 ┤                      ╭─────╯╯
+ 180 ┤               ╭──────╯
+ 120 ┤         ╭─────╯╯
+  60 ┤   ╭─────╯
+   0 ┼───╯
+                                          replicas
+----
+----
+
+plot stat=leases
+----
+----
+
+ 900 ┼──╮
+ 840 ┤  ╰──╮
+ 780 ┤     ╰──╮
+ 720 ┤        ╰───╮
+ 660 ┤            ╰──╮
+ 600 ┤               ╰──╮
+ 540 ┤                  ╰──╮
+ 480 ┤                     ╰──╮
+ 420 ┤                        ╰──╮
+ 360 ┤                           ╰───╮
+ 300 ┤                               ╰──╮
+ 240 ┤                                  ╰──╮
+ 180 ┤                                     ╰─╮
+ 120 ┤                       ╭───────────────────────────────────────────────────────
+  60 ┤        ╭╭─────────────╯───────╯─╯ ╭────╯╯
+   0 ┼─────────╯╯─╯──────────────────────╯╯
+                                           leases
+----
+----
+
+topology
+----
+us
+  aws-east-1
+    us-east-1a
+    │ └── [7]
+    us-east-1b
+    │ └── [8]
+    us-east-1c
+    │ └── [9]
+  aws-west-1
+    us-west-1a
+    │ └── [1]
+    us-west-1b
+    │ └── [2]
+    us-west-1c
+    │ └── [3]
+  aws-west-2
+    us-west-2a
+      └── [4]
+    us-west-2b
+      └── [5]
+    us-west-2c
+      └── [6]
+
+# vim:ft=sh
diff --git a/pkg/kv/kvserver/asim/tests/testdata/non_rand/diversity_no_matching_prefix b/pkg/kv/kvserver/asim/tests/testdata/non_rand/diversity_no_matching_prefix
new file mode 100644
index 000000000000..bdffa0f2b509
--- /dev/null
+++ b/pkg/kv/kvserver/asim/tests/testdata/non_rand/diversity_no_matching_prefix
@@ -0,0 +1,110 @@
+gen_cluster nodes=9
+----
+
+set_locality node=1 locality=region=aws-west-1,zone=us-west-1a
+----
+
+set_locality node=2 locality=region=aws-west-1,zone=us-west-1b
+----
+
+set_locality node=3 locality=region=aws-west-1,zone=us-west-1c
+----
+
+set_locality node=4 locality=region=aws-west-2,zone=us-west-2a
+----
+
+set_locality node=5 locality=region=aws-west-2,zone=us-west-2b
+----
+
+set_locality node=6 locality=region=aws-west-2,zone=us-west-2c
+----
+
+set_locality node=7 locality=region=aws-east-1,zone=us-east-1a
+----
+
+set_locality node=8 locality=region=aws-east-1,zone=us-east-1b
+----
+
+set_locality node=9 locality=region=aws-east-1,zone=us-east-1c
+----
+
+gen_ranges ranges=900 repl_factor=3 placement_skew=true
+----
+
+eval duration=30m seed=42
+----
+OK
+
+plot stat=replicas
+----
+----
+
+ 900 ┼─╮╮
+ 840 ┤ ╰───╮
+ 780 ┤     ╰─╮╮
+ 720 ┤       ╰───╮╮
+ 660 ┤           ╰──╮╮
+ 600 ┤              ╰──╮╮
+ 540 ┤                 ╰───╮
+ 480 ┤                    ╰╰─╮╮
+ 420 ┤                       ╰───╮
+ 360 ┤                           ╰───╮
+ 300 ┤                            ╭──────────────────────────────────────────────────
+ 240 ┤                      ╭─────╯╯
+ 180 ┤               ╭──────╯
+ 120 ┤         ╭─────╯╯
+  60 ┤   ╭─────╯
+   0 ┼───╯
+                                          replicas
+----
+----
+
+plot stat=leases
+----
+----
+
+ 900 ┼──╮
+ 840 ┤  ╰──╮
+ 780 ┤     ╰──╮
+ 720 ┤        ╰───╮
+ 660 ┤            ╰──╮
+ 600 ┤               ╰──╮
+ 540 ┤                  ╰──╮
+ 480 ┤                     ╰──╮
+ 420 ┤                        ╰──╮
+ 360 ┤                           ╰───╮
+ 300 ┤                               ╰──╮
+ 240 ┤                                  ╰──╮
+ 180 ┤                                     ╰─╮
+ 120 ┤                       ╭───────────────────────────────────────────────────────
+  60 ┤        ╭╭─────────────╯───────╯─╯ ╭────╯╯
+   0 ┼─────────╯╯─╯──────────────────────╯╯
+                                           leases
+----
+----
+
+topology
+----
+aws-east-1
+  us-east-1a
+  │ └── [7]
+  us-east-1b
+  │ └── [8]
+  us-east-1c
+  │ └── [9]
+aws-west-1
+  us-west-1a
+  │ └── [1]
+  us-west-1b
+  │ └── [2]
+  us-west-1c
+  │ └── [3]
+aws-west-2
+  us-west-2a
+    └── [4]
+  us-west-2b
+    └── [5]
+  us-west-2c
+    └── [6]
+
+# vim:ft=sh