Skip to content

Commit 6d7556c

Browse files
authored
Merge pull request #153891 from miraradeva/mira-perturbation-backport
[release-24.3] roachtest: skip many perturbation tests
2 parents a8691b0 + fb63a40 commit 6d7556c

File tree

1 file changed

+29
-22
lines changed

1 file changed

+29
-22
lines changed

pkg/cmd/roachtest/tests/admission_control_latency.go

Lines changed: 29 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -207,26 +207,29 @@ func setupDev(p perturbation) variations {
207207
}
208208

209209
func registerLatencyTests(r registry.Registry) {
210-
// NB: If these tests fail because they are flaky, increase the numbers
211-
// until they pass. Additionally add the seed (from the log) that caused
212-
// them to fail as a comment in the test.
213-
addMetamorphic(r, &restart{}, math.Inf(1))
214-
addMetamorphic(r, &partition{}, math.Inf(1))
215-
addMetamorphic(r, addNode{}, 5.0)
216-
addMetamorphic(r, &decommission{}, 5.0)
217-
addMetamorphic(r, backfill{}, 40.0)
218-
addMetamorphic(r, &slowDisk{}, math.Inf(1))
219-
addMetamorphic(r, elasticWorkload{}, math.Inf(1))
220-
221-
// NB: If these tests fail, it likely signals a regression. Investigate the
222-
// history of the test on roachperf to see what changed.
223-
addFull(r, &restart{cleanRestart: true}, math.Inf(1))
224-
addFull(r, &partition{partitionSite: true}, math.Inf(1))
225-
addFull(r, addNode{}, 5.0)
226-
addFull(r, &decommission{drain: true}, 5.0)
227-
addFull(r, backfill{}, 40.0)
228-
addFull(r, &slowDisk{slowLiveness: true, walFailover: true}, math.Inf(1))
229-
addFull(r, elasticWorkload{}, math.Inf(1))
210+
const notSkipped = ""
211+
const skippedByBankruptcy = "#149662"
212+
213+
// All metamorphic perturbation tests are currently disabled. See
214+
// https://github.com/cockroachdb/cockroach/issues/142148.
215+
addMetamorphic(r, &restart{}, math.Inf(1), skippedByBankruptcy)
216+
addMetamorphic(r, &partition{}, math.Inf(1), skippedByBankruptcy)
217+
addMetamorphic(r, addNode{}, 5.0, skippedByBankruptcy)
218+
addMetamorphic(r, &decommission{}, 5.0, skippedByBankruptcy)
219+
addMetamorphic(r, backfill{}, 40.0, skippedByBankruptcy)
220+
addMetamorphic(r, &slowDisk{}, math.Inf(1), skippedByBankruptcy)
221+
addMetamorphic(r, elasticWorkload{}, math.Inf(1), skippedByBankruptcy)
222+
223+
// TODO(ssd): We skipped the majority of these tests so that we can focus on
224+
// one at a time. These are vaguely ordered by their previous pass rate
225+
// (highest first).
226+
addFull(r, &restart{cleanRestart: true}, math.Inf(1), notSkipped)
227+
addFull(r, &partition{partitionSite: true}, math.Inf(1), skippedByBankruptcy)
228+
addFull(r, addNode{}, 5.0, skippedByBankruptcy)
229+
addFull(r, &decommission{drain: true}, 5.0, skippedByBankruptcy)
230+
addFull(r, backfill{}, 40.0, notSkipped)
231+
addFull(r, &slowDisk{slowLiveness: true, walFailover: true}, math.Inf(1), skippedByBankruptcy)
232+
addFull(r, elasticWorkload{}, math.Inf(1), skippedByBankruptcy)
230233

231234
// NB: These tests will never fail and are not enabled, but they are useful
232235
// for development.
@@ -252,13 +255,16 @@ func (v variations) perturbationName() string {
252255
return t.Name()
253256
}
254257

255-
func addMetamorphic(r registry.Registry, p perturbation, acceptableChange float64) {
258+
func addMetamorphic(
259+
r registry.Registry, p perturbation, acceptableChange float64, skipReason string,
260+
) {
256261
v := setupMetamorphic(p)
257262
v.acceptableChange = acceptableChange
258263
// TODO(baptist): Make the cloud be metamorphic for repeatable results with
259264
// a given seed.
260265
r.Add(registry.TestSpec{
261266
Name: fmt.Sprintf("perturbation/metamorphic/%s", v.perturbationName()),
267+
Skip: skipReason,
262268
CompatibleClouds: v.cloud,
263269
Suites: registry.Suites(registry.Perturbation),
264270
Owner: registry.OwnerKV,
@@ -269,11 +275,12 @@ func addMetamorphic(r registry.Registry, p perturbation, acceptableChange float6
269275
})
270276
}
271277

272-
func addFull(r registry.Registry, p perturbation, acceptableChange float64) {
278+
func addFull(r registry.Registry, p perturbation, acceptableChange float64, skipReason string) {
273279
v := setupFull(p)
274280
v.acceptableChange = acceptableChange
275281
r.Add(registry.TestSpec{
276282
Name: fmt.Sprintf("perturbation/full/%s", v.perturbationName()),
283+
Skip: skipReason,
277284
CompatibleClouds: v.cloud,
278285
Suites: registry.Suites(registry.Nightly),
279286
Owner: registry.OwnerKV,

0 commit comments

Comments
 (0)