asim: support store_byte_capacity option with gen_cluster

This commit adds support for the store_byte_capacity option in the gen_cluster
command, enabling data-driven tests to change configuration of store capacity in
bytes.

Epic: none
Release note: none

Author: wenyihu6

pkg/kv/kvserver/asim/gen/generator.go

@@ -187,12 +187,14 @@ func (lc LoadedCluster) Regions() []state.Region {
 
 // BasicCluster implements the ClusterGen interace.
 type BasicCluster struct {
-	Nodes         int
-	StoresPerNode int
+	Nodes             int
+	StoresPerNode     int
+	StoreByteCapacity int64
 }
 
 func (bc BasicCluster) String() string {
-	return fmt.Sprintf("basic cluster with nodes=%d, stores_per_node=%d", bc.Nodes, bc.StoresPerNode)
+	return fmt.Sprintf("basic cluster with nodes=%d, stores_per_node=%d, store_byte_capacity=%d",
+		bc.Nodes, bc.StoresPerNode, bc.StoreByteCapacity)
 }
 
 // Generate returns a new simulator state, where the cluster is created with all
@@ -201,6 +203,7 @@ func (bc BasicCluster) String() string {
 // values the basic cluster generator is created with.
 func (bc BasicCluster) Generate(seed int64, settings *config.SimulationSettings) state.State {
 	info := state.ClusterInfoWithStoreCount(bc.Nodes, bc.StoresPerNode)
+	info.StoreDiskCapacityBytes = bc.StoreByteCapacity
 	return state.LoadClusterInfo(info, settings)
 }
 

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

@@ -26,7 +26,7 @@ var AllClusterOptions = [...]string{"single_region", "single_region_multi_store"
 // SingleRegionConfig is a simple cluster config with a single region and 3
 // zones, all have the same number of nodes.
 var SingleRegionConfig = ClusterInfo{
-	DiskCapacityGB: 1024,
+	StoreDiskCapacityBytes: 1024 << 30, // 1024 GiB
 	Regions: []Region{
 		{
 			Name: "US",
@@ -42,7 +42,7 @@ var SingleRegionConfig = ClusterInfo{
 // SingleRegionMultiStoreConfig is a simple cluster config with a single region
 // and 3 zones, all zones have 1 node and 6 stores per node.
 var SingleRegionMultiStoreConfig = ClusterInfo{
-	DiskCapacityGB: 1024,
+	StoreDiskCapacityBytes: 1024 << 30, // 1024 GiB
 	Regions: []Region{
 		{
 			Name: "US",
@@ -57,7 +57,7 @@ var SingleRegionMultiStoreConfig = ClusterInfo{
 
 // MultiRegionConfig is a perfectly balanced cluster config with 3 regions.
 var MultiRegionConfig = ClusterInfo{
-	DiskCapacityGB: 2048,
+	StoreDiskCapacityBytes: 2048 << 30, // 2048 GiB
 	Regions: []Region{
 		{
 			Name: "US_East",
@@ -88,7 +88,7 @@ var MultiRegionConfig = ClusterInfo{
 
 // ComplexConfig is an imbalanced multi-region cluster config.
 var ComplexConfig = ClusterInfo{
-	DiskCapacityGB: 2048,
+	StoreDiskCapacityBytes: 2048 << 30, // 2048 GiB
 	Regions: []Region{
 		{
 			Name: "US_East",
@@ -276,8 +276,8 @@ type Region struct {
 // ClusterInfo contains cluster information needed for allocation decisions.
 // TODO(lidor): add cross region network latencies.
 type ClusterInfo struct {
-	DiskCapacityGB int
-	Regions        []Region
+	Regions                []Region
+	StoreDiskCapacityBytes int64
 }
 
 func (c ClusterInfo) String() (s string) {
@@ -380,7 +380,7 @@ func LoadClusterInfo(c ClusterInfo, settings *config.SimulationSettings) State {
 							node.NodeID(),
 						))
 					} else {
-						s.SetStoreCapacity(newStore.StoreID(), int64(c.DiskCapacityGB)*1<<30)
+						s.SetStoreCapacity(newStore.StoreID(), c.StoreDiskCapacityBytes)
 					}
 				}
 			}

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

@@ -257,11 +257,14 @@ func TestDataDriven(t *testing.T) {
 			case "gen_cluster":
 				var nodes = 3
 				var storesPerNode = 1
+				var storeByteCapacity int64 = 256 << 30 /* 256 GiB  */
 				scanIfExists(t, d, "nodes", &nodes)
 				scanIfExists(t, d, "stores_per_node", &storesPerNode)
+				scanIfExists(t, d, "store_byte_capacity", &storeByteCapacity)
 				clusterGen = gen.BasicCluster{
-					Nodes:         nodes,
-					StoresPerNode: storesPerNode,
+					Nodes:             nodes,
+					StoresPerNode:     storesPerNode,
+					StoreByteCapacity: storeByteCapacity,
 				}
 				return ""
 			case "load_cluster":

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

@@ -15,8 +15,9 @@ import (
 // disabled. For instance, defaultBasicRangesGen is only used if
 // randOption.range is false.
 const (
-	defaultNodes         = 3
-	defaultStoresPerNode = 1
+	defaultNodes             = 3
+	defaultStoresPerNode     = 1
+	defaultStoreByteCapacity = 256 << 30 // 256 GiB
 )
 
 const (
@@ -41,6 +42,7 @@ const (
 type staticOptionSettings struct {
 	nodes             int
 	storesPerNode     int
+	storeByteCapacity int64
 	rwRatio           float64
 	rate              float64
 	minBlock          int
@@ -61,6 +63,7 @@ func getDefaultStaticOptionSettings() staticOptionSettings {
 	return staticOptionSettings{
 		nodes:             defaultNodes,
 		storesPerNode:     defaultStoresPerNode,
+		storeByteCapacity: defaultStoreByteCapacity,
 		rwRatio:           defaultRwRatio,
 		rate:              defaultRate,
 		minBlock:          defaultMinBlock,
@@ -80,8 +83,9 @@ func getDefaultStaticOptionSettings() staticOptionSettings {
 
 func (f randTestingFramework) defaultBasicClusterGen() gen.BasicCluster {
 	return gen.BasicCluster{
-		Nodes:         f.defaultStaticSettings.nodes,
-		StoresPerNode: f.defaultStaticSettings.storesPerNode,
+		Nodes:             f.defaultStaticSettings.nodes,
+		StoresPerNode:     f.defaultStaticSettings.storesPerNode,
+		StoreByteCapacity: f.defaultStaticSettings.storeByteCapacity,
 	}
 }
 

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

@@ -96,7 +96,8 @@ func printTestSettings(t testSettings, staticSettings staticOptionSettings, buf
 		buf.WriteString(fmt.Sprintf("\t%v\n", t.clusterGen))
 	} else {
 		buf.WriteString(configStr("cluster", "static"))
-		buf.WriteString(fmt.Sprintf("\tnodes=%d, stores_per_node=%d\n", staticSettings.nodes, staticSettings.storesPerNode))
+		buf.WriteString(fmt.Sprintf("\tnodes=%d, stores_per_node=%d, store_byte_capacity=%d\n",
+			staticSettings.nodes, staticSettings.storesPerNode, staticSettings.storeByteCapacity))
 	}
 
 	if t.randOptions.ranges {

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

@@ -113,6 +113,8 @@ const (
 //	- nodes (default value is 3): number of nodes in the generated cluster
 //	- storesPerNode (default value is 1): number of store per nodes in the
 // 	  generated cluster
+//	- storeByteCapacity (default value is 256 << 30): disk capacity of each
+//    store in the generated cluster
 //	- rwRatio (default value is 0.0): read-write ratio of the generated load
 //	- rate (default value is 0.0): rate at which the load is generated
 //	- minBlock (default value is 1): min size of each load event
@@ -178,6 +180,7 @@ func TestRandomized(t *testing.T) {
 			case "change_static_option":
 				scanIfExists(t, d, "nodes", &staticOptionSettings.nodes)
 				scanIfExists(t, d, "stores_per_node", &staticOptionSettings.storesPerNode)
+				scanIfExists(t, d, "store_byte_capacity", &staticOptionSettings.storeByteCapacity)
 				scanIfExists(t, d, "rw_ratio", &staticOptionSettings.rwRatio)
 				scanIfExists(t, d, "rate", &staticOptionSettings.rate)
 				scanIfExists(t, d, "min_block", &staticOptionSettings.minBlock)

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

@@ -19,46 +19,46 @@ OK
 # store 5. This is shown below as it sheds replicas.
 plot stat=replicas
 ----
- 340 ┤                                                                     ╭╮     ╭╮╭
- 329 ┤                                    ╭╭─╭──╮╭─╮╭─╮╭─╭╮╭╭╮  ╭╮ ╭╮╮╭╭─╮─╭╭╮─╭╭╮╯╭╯
- 319 ┤                 ╭╮ ╭╮  ╭╮╭╭╮╭╮ ╭╮╭────╯─╯╰╯╭╰──────╮╭╯│─╭╯│╭╯╰╮╭╯╰│─╭╯│─╭╯╰─╯─
- 308 ┤                ╭╭──╮╭╭────╯╰╮╭─╯╰╯╰╯ ╰╯   ╰╯ ╰─╰─╯╰╰╯╯╰─╯╰╰╯  ╰╯─╯╰─╯╰╰─╯╰╯  ╰
- 297 ┼╮────────────────╯╭╯╰╭╮─╯╯╯╰╯╰╯││
- 286 ┤╰───────────────╮╰╯  ││        ╰╯
- 276 ┤                │╭─╮╭╯╰╮
- 265 ┤                ╰╯ ╰╯  │╭─╮ ╭╮ ╭╮
- 254 ┤                       ╰╯ │ ││ ││
- 243 ┤                          ╰─╯╰─╯╰╮
- 233 ┤                                 │                  ╭╮  ╭╮
- 222 ┤                                 ╰──╮           ╭╮  │╰╮╭╯│ ╭╮
- 211 ┤                                    │ ╭─╮     ╭╮│╰╮╭╯ ││ ╰─╯│  ╭╮             ╭
- 200 ┤                                    ╰╮│ │  ╭╮ │╰╯ ╰╯  ╰╯    ╰╮ │╰╮ ╭─╮╭──╮╭─╮ │
- 190 ┤                                     ╰╯ ╰╮╭╯╰─╯              ╰─╯ │ │ ││  ││ ╰─╯
- 179 ┤                                         ╰╯                      ╰─╯ ╰╯  ╰╯
+ 342 ┤                                                                    ╭╮╭─╮╭╭╭─╮╭
+ 331 ┤                         ╭╮ ╭╭─╮╮╭╮╭╭╮╭╭───╮─╭──╮╮  ╭╮──╭╭───╮─╮╭──╮╯╭╯╭╰╮╭╯│╰─
+ 319 ┤                  ╭╭╮╭╮─╭─╭──╯╭│╭╭─────╯╯╰─│╭╯╮╭│╰─╭╮╭───╯╭─╯│╭─╯╭─╰─╯╰╯─╰╯╭╰╰╯
+ 308 ┤               ╭───╭──────╯╯╰╰╯╰─╯╰╯  ╰╯   ╰╯ ╰╯╰──╯╰╯  ╰╰╯╯ ╰╯ ╰╯        ╰╯
+ 296 ┼───────────────╮───╯╯╯╰╯
+ 285 ┤               ╰──╮
+ 274 ┤                  │╭─╮
+ 262 ┤                  ╰╯ │╭╮
+ 251 ┤                     ╰╯╰╮ ╭╮
+ 239 ┤                        │╭╯│                     ╭─╮
+ 228 ┤                        ╰╯ ╰╮╭╮   ╭╮ ╭─╮         │ │ ╭╮  ╭╮
+ 217 ┤                            ╰╯╰───╯│╭╯ │   ╭╮ ╭╮╭╯ ╰─╯╰╮╭╯│     ╭╮
+ 205 ┤                                   ╰╯  ╰╮╭─╯╰─╯╰╯      ╰╯ ╰╮ ╭╮ ││
+ 194 ┤                                        ││                 ╰─╯╰─╯╰╮╭╮ ╭╮  ╭╮ ╭╮
+ 182 ┤                                        ╰╯                        ╰╯╰╮│╰╮╭╯│ │╰
+ 171 ┤                                                                     ╰╯ ╰╯ ╰─╯
                                           replicas
 initial store values: [s1=300, s2=300, s3=300, s4=300, s5=300] (stddev=0.00, mean=300.00, sum=1500)
-last store values: [s1=313, s2=334, s3=317, s4=340, s5=211] (stddev=47.10, mean=303.00, sum=1515)
+last store values: [s1=342, s2=341, s3=326, s4=328, s5=178] (stddev=62.84, mean=303.00, sum=1515)
 
 # Plot the % of disk storage capacity used. We should see s5 hovering right
 # around 92.5-95% (the storage capacity threshold value).
 plot stat=disk_fraction_used
 ----
- 1.09 ┤                                                        ╭╮ ╭╮
- 1.02 ┤                     ╭─╮╭╮     ╭─╮ ╭╮ ╭─╮       ╭╮  ╭╮  ││ │╰╮ ╭╮  ╭─╮ ╭╮  ╭╮
- 0.95 ┤          ╭────────╮ │ ││╰───╮╭╯ ╰─╯╰╮│ ╰╮╭─╮ ╭╮│╰╮╭╯╰╮╭╯│╭╯ │ │╰╮ │ │╭╯╰╮╭╯╰╮╭
- 0.87 ┤ ╭────────╯        ╰─╯ ╰╯    ╰╯      ╰╯  ╰╯ ╰─╯╰╯ ╰╯  ╰╯ ╰╯  ╰─╯ ╰─╯ ╰╯  ╰╯  ╰╯
- 0.80 ┼─╯
- 0.73 ┤
- 0.66 ┤
- 0.58 ┤
- 0.51 ┤
- 0.44 ┤
- 0.36 ┤
- 0.29 ┤
- 0.22 ┤
- 0.15 ┤
- 0.07 ┤
- 0.00 ┼───────────────────────────────────────────────────────────────────────────────
+ 1.10 ┤                                     ╭╮          ╭╮             ╭╮           ╭╮
+ 1.04 ┤                      ╭╮  ╭╮         │╰╮   ╭╮    ││  ╭╮  ╭╮     ││ ╭╮ ╭╮ ╭─╮ │╰
+ 0.97 ┤           ╭───╮╭─╮ ╭╮│╰╮╭╯╰╮╭╮╭╮ ╭╮ │ ╰╮╭╮││ ╭╮ │╰╮╭╯╰╮╭╯╰╮ ╭╮ │╰╮││ │╰╮│ │╭╯
+ 0.91 ┤    ╭──────╯   ╰╯ ╰─╯╰╯ ╰╯  ╰╯╰╯╰─╯│╭╯  ││╰╯╰─╯│╭╯ ╰╯  ╰╯  ╰─╯╰─╯ ╰╯╰─╯ ╰╯ ╰╯
+ 0.84 ┼────╯                              ╰╯   ╰╯     ╰╯
+ 0.78 ┤
+ 0.71 ┤
+ 0.65 ┤
+ 0.59 ┤
+ 0.52 ┤
+ 0.46 ┤
+ 0.39 ┤
+ 0.33 ┤
+ 0.26 ┤                                               ╭╮  ╭╮╮╭─╭╭────╮╭───────────────
+ 0.20 ┤               ╭╮╭╭────────────────────────────╯╰──╯╰────╯─╯╰─╰╯──╯
+ 0.14 ┼──────────────────╯ ╰╯╰╯
                                       disk_fraction_used
-initial store values: [s1=0.00, s2=0.00, s3=0.00, s4=0.00, s5=0.83] (stddev=0.33, mean=0.17, sum=1)
-last store values: [s1=0.00, s2=0.00, s3=0.00, s4=0.00, s5=0.97] (stddev=0.39, mean=0.19, sum=1)
+initial store values: [s1=0.14, s2=0.14, s3=0.14, s4=0.14, s5=0.83] (stddev=0.28, mean=0.28, sum=1)
+last store values: [s1=0.28, s2=0.26, s3=0.25, s4=0.25, s5=1.00] (stddev=0.30, mean=0.41, sum=2)

pkg/kv/kvserver/asim/tests/testdata/rand/default_settings

@@ -45,7 +45,7 @@ test settings
 	num_iterations=3 duration=10m0s
 ----------------------------------
 generating cluster configurations using static option
-	nodes=3, stores_per_node=1
+	nodes=3, stores_per_node=1, store_byte_capacity=274877906944
 generating ranges configurations using static option
 	placement_type=even, ranges=10, min_key=0, max_key=200000, replication_factor=3, bytes=0
 generating load configurations using static option
@@ -73,23 +73,23 @@ eval verbose=(config_gen)
 ----------------------------------
 sample1: start running
 configurations generated using seed 3440579354231278675
-	basic cluster with nodes=3, stores_per_node=1
+	basic cluster with nodes=3, stores_per_node=1, store_byte_capacity=274877906944
 	basic ranges with placement_type=even, ranges=10, min_key=0, max_key=200000, replication_factor=3, bytes=0
 	basic load with rw_ratio=0.00, rate=0.00, skewed_access=false, min_block_size=1, max_block_size=1, min_key=0, max_key=200000
 	number of mutation events=0, number of assertion events=0
 sample1: pass
 ----------------------------------
 sample2: start running
 configurations generated using seed 608747136543856411
-	basic cluster with nodes=3, stores_per_node=1
+	basic cluster with nodes=3, stores_per_node=1, store_byte_capacity=274877906944
 	basic ranges with placement_type=even, ranges=10, min_key=0, max_key=200000, replication_factor=3, bytes=0
 	basic load with rw_ratio=0.00, rate=0.00, skewed_access=false, min_block_size=1, max_block_size=1, min_key=0, max_key=200000
 	number of mutation events=0, number of assertion events=0
 sample2: pass
 ----------------------------------
 sample3: start running
 configurations generated using seed 5571782338101878760
-	basic cluster with nodes=3, stores_per_node=1
+	basic cluster with nodes=3, stores_per_node=1, store_byte_capacity=274877906944
 	basic ranges with placement_type=even, ranges=10, min_key=0, max_key=200000, replication_factor=3, bytes=0
 	basic load with rw_ratio=0.00, rate=0.00, skewed_access=false, min_block_size=1, max_block_size=1, min_key=0, max_key=200000
 	number of mutation events=0, number of assertion events=0
@@ -161,7 +161,7 @@ test settings
 	num_iterations=3 duration=10m0s
 ----------------------------------
 generating cluster configurations using static option
-	nodes=3, stores_per_node=1
+	nodes=3, stores_per_node=1, store_byte_capacity=274877906944
 generating ranges configurations using static option
 	placement_type=even, ranges=10, min_key=0, max_key=200000, replication_factor=3, bytes=0
 generating load configurations using static option
@@ -171,7 +171,7 @@ generating settings configurations using static option
 ----------------------------------
 sample1: start running
 configurations generated using seed 3440579354231278675
-	basic cluster with nodes=3, stores_per_node=1
+	basic cluster with nodes=3, stores_per_node=1, store_byte_capacity=274877906944
 	basic ranges with placement_type=even, ranges=10, min_key=0, max_key=200000, replication_factor=3, bytes=0
 	basic load with rw_ratio=0.00, rate=0.00, skewed_access=false, min_block_size=1, max_block_size=1, min_key=0, max_key=200000
 	number of mutation events=0, number of assertion events=0
@@ -181,7 +181,7 @@ sample1: pass
 ----------------------------------
 sample2: start running
 configurations generated using seed 608747136543856411
-	basic cluster with nodes=3, stores_per_node=1
+	basic cluster with nodes=3, stores_per_node=1, store_byte_capacity=274877906944
 	basic ranges with placement_type=even, ranges=10, min_key=0, max_key=200000, replication_factor=3, bytes=0
 	basic load with rw_ratio=0.00, rate=0.00, skewed_access=false, min_block_size=1, max_block_size=1, min_key=0, max_key=200000
 	number of mutation events=0, number of assertion events=0
@@ -191,7 +191,7 @@ sample2: pass
 ----------------------------------
 sample3: start running
 configurations generated using seed 5571782338101878760
-	basic cluster with nodes=3, stores_per_node=1
+	basic cluster with nodes=3, stores_per_node=1, store_byte_capacity=274877906944
 	basic ranges with placement_type=even, ranges=10, min_key=0, max_key=200000, replication_factor=3, bytes=0
 	basic load with rw_ratio=0.00, rate=0.00, skewed_access=false, min_block_size=1, max_block_size=1, min_key=0, max_key=200000
 	number of mutation events=0, number of assertion events=0
@@ -211,7 +211,7 @@ test settings
 	num_iterations=3 duration=10m0s
 ----------------------------------
 generating cluster configurations using static option
-	nodes=3, stores_per_node=1
+	nodes=3, stores_per_node=1, store_byte_capacity=274877906944
 generating ranges configurations using static option
 	placement_type=even, ranges=10, min_key=0, max_key=200000, replication_factor=3, bytes=0
 generating load configurations using static option
@@ -221,7 +221,7 @@ generating settings configurations using static option
 ----------------------------------
 sample1: start running
 configurations generated using seed 3440579354231278675
-	basic cluster with nodes=3, stores_per_node=1
+	basic cluster with nodes=3, stores_per_node=1, store_byte_capacity=274877906944
 	basic ranges with placement_type=even, ranges=10, min_key=0, max_key=200000, replication_factor=3, bytes=0
 	basic load with rw_ratio=0.00, rate=0.00, skewed_access=false, min_block_size=1, max_block_size=1, min_key=0, max_key=200000
 	number of mutation events=0, number of assertion events=0
@@ -236,7 +236,7 @@ sample1: pass
 ----------------------------------
 sample2: start running
 configurations generated using seed 608747136543856411
-	basic cluster with nodes=3, stores_per_node=1
+	basic cluster with nodes=3, stores_per_node=1, store_byte_capacity=274877906944
 	basic ranges with placement_type=even, ranges=10, min_key=0, max_key=200000, replication_factor=3, bytes=0
 	basic load with rw_ratio=0.00, rate=0.00, skewed_access=false, min_block_size=1, max_block_size=1, min_key=0, max_key=200000
 	number of mutation events=0, number of assertion events=0
@@ -251,7 +251,7 @@ sample2: pass
 ----------------------------------
 sample3: start running
 configurations generated using seed 5571782338101878760
-	basic cluster with nodes=3, stores_per_node=1
+	basic cluster with nodes=3, stores_per_node=1, store_byte_capacity=274877906944
 	basic ranges with placement_type=even, ranges=10, min_key=0, max_key=200000, replication_factor=3, bytes=0
 	basic load with rw_ratio=0.00, rate=0.00, skewed_access=false, min_block_size=1, max_block_size=1, min_key=0, max_key=200000
 	number of mutation events=0, number of assertion events=0
@@ -279,7 +279,7 @@ test settings
 	num_iterations=3 duration=20m0s
 ----------------------------------
 generating cluster configurations using static option
-	nodes=5, stores_per_node=5
+	nodes=5, stores_per_node=5, store_byte_capacity=274877906944
 generating ranges configurations using static option
 	placement_type=skewed, ranges=2, min_key=0, max_key=10000, replication_factor=5, bytes=2
 generating load configurations using static option