roachtest: add GCEVolumeCount spec option

xinhaoz · xinhaoz · commit 8442c5c1c6b3 · 2025-05-29T11:13:44.000-04:00
Adds option for specifying the volume count on gce.

We also enable the `UseMultipleDisks` option for the gce disk setup script when
we have a volume count greater than 0, which allows us to mount one volume per
store for multi-store testing.

Epic: none
Release note: None
diff --git a/pkg/cmd/roachtest/spec/cluster_spec.go b/pkg/cmd/roachtest/spec/cluster_spec.go
@@ -268,7 +268,7 @@ func getGCEOpts(
 		opts.PDVolumeCount = volumeCount
 	}
 	opts.SSDCount = localSSDCount
-	if localSSD && localSSDCount > 0 {
+	if (localSSD && localSSDCount > 0) || (!localSSD && volumeCount > 1) {
 		// NB: As the default behavior for _roachprod_ (at least in AWS/GCP) is
 		// to mount multiple disks as a single store using a RAID 0 array, we
 		// must explicitly ask for multiple stores to be enabled, _unless_ the

Original file line number	Diff line number	Diff line change
`@@ -268,7 +268,7 @@ func getGCEOpts(`
`268`	`268`	`opts.PDVolumeCount = volumeCount`
`269`	`269`	`}`
`270`	`270`	`opts.SSDCount = localSSDCount`
`271`		`- if localSSD && localSSDCount > 0 {`
	`271`	`+ if (localSSD && localSSDCount > 0) \|\| (!localSSD && volumeCount > 1) {`
`272`	`272`	`// NB: As the default behavior for _roachprod_ (at least in AWS/GCP) is`
`273`	`273`	`// to mount multiple disks as a single store using a RAID 0 array, we`
`274`	`274`	`// must explicitly ask for multiple stores to be enabled, _unless_ the`