Skip to content

Commit

Permalink
backupccl: avoid RAID0ing local NVMe and GP3 storage in restore roach…
Browse files Browse the repository at this point in the history
…tests

A long restore roachtest perf investigation revealed that roachprod can RAID0
local storage and AWS GP3 storage, a configuration that does not mix well with
CRDB and does not reflect a reasonable customer environment. This patch avoids
this RAID0ing in the restore roachtests, stabilizing test performance.

Informs #98783

Fixes #97019

Release note: none
  • Loading branch information
msbutler committed Mar 30, 2023
1 parent a5dc09b commit 64edfd1
Showing 1 changed file with 11 additions and 1 deletion.
12 changes: 11 additions & 1 deletion pkg/cmd/roachtest/tests/restore.go
Original file line number Diff line number Diff line change
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 {
// Work around an issue that RAID0s local NVMe and GP3 storage together:
// https://github.com/cockroachdb/cockroach/issues/98783.
//
// TODO(srosenberg): Remove this workaround when 98783 is addressed.
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

0 comments on commit 64edfd1

Please sign in to comment.