Skip to content

Commit 2f9373f

Browse files
committed
roachtest: fix pertubation disk stall
These tests were not calling disk stall setup. While setup is currently a noop under the configuration it uses, the FI framework asserts that failers are setup first.
1 parent ddfad6b commit 2f9373f

File tree

2 files changed

+5
-0
lines changed

2 files changed

+5
-0
lines changed

pkg/cmd/roachtest/tests/perturbation/framework.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -297,6 +297,10 @@ func RegisterTests(r registry.Registry) {
297297

298298
func (v variations) makeClusterSpec() spec.ClusterSpec {
299299
opts := append(v.specOptions, spec.CPU(v.vcpu), spec.SSD(v.disks), spec.Mem(v.mem), spec.TerminateOnMigration())
300+
// Disable cluster reuse to avoid potential cgroup side effects.
301+
if v.perturbationName() == "slowDisk" {
302+
opts = append(opts, spec.ReuseNone())
303+
}
300304
return spec.MakeClusterSpec(v.numNodes+v.numWorkloadNodes, opts...)
301305
}
302306

pkg/cmd/roachtest/tests/perturbation/slow_disk.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ func (s *slowDisk) startTargetNode(ctx context.Context, t test.Test, v variation
6767
s.staller = roachtestutil.NoopDiskStaller{}
6868
} else {
6969
s.staller = roachtestutil.MakeCgroupDiskStaller(t, v, false /* readsToo */, false /* logsToo */)
70+
s.staller.Setup(ctx)
7071
}
7172
}
7273

0 commit comments

Comments
 (0)