Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

roachtest: use c5, not c5d, for restore 8tb test #98767

Closed
wants to merge 1 commit into from
Closed

roachtest: use c5, not c5d, for restore 8tb test #98767

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions pkg/cmd/roachtest/tests/restore.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,7 @@ func registerRestore(r registry.Registry) {
},
{
// The nightly 8TB Restore test.
hardware: makeHardwareSpecs(hardwareSpecs{nodes: 10, volumeSize: 2000}),
hardware: makeHardwareSpecs(hardwareSpecs{cpus: 8, nodes: 10, volumeSize: 2000}),
backup: makeBackupSpecs(backupSpecs{
version: "v22.2.1",
workload: tpceRestore{customers: 500000}}),
Expand Down Expand Up @@ -411,7 +411,17 @@ func (hw hardwareSpecs) makeClusterSpecs(r registry.Registry) spec.ClusterSpec {
if hw.mem != spec.Auto {
clusterOpts = append(clusterOpts, spec.Mem(hw.mem))
}
return r.MakeClusterSpec(hw.nodes, clusterOpts...)
s := r.MakeClusterSpec(hw.nodes, clusterOpts...)
if s.Cloud == "aws" && s.VolumeSize != 0 && s.Mem != spec.Low {
// Work around an issue that RAID0s local NVMe and GP3 storage together:
// https://github.com/cockroachdb/cockroach/issues/98783.
//
// This should be removed once we have found a real solution that avoids
// ever creating such a RAID.
s.InstanceType = spec.AWSMachineType(s.CPUs, s.Mem)
s.InstanceType = strings.Replace(s.InstanceType, "d.", ".", 1)
}
return s
}

// String prints the hardware specs. If verbose==true, verbose specs are printed.
Expand Down