Skip to content

Commit 0946522

Browse files
committed
roachtest: remove rangeTs variants of import-cancellation test
Previously the import-cancellation roachtest was split into two variants: one with MVCC range tombstones enabled and one without. MVCC range tombstones are always enabled now, so the two variants were effectively identical. This commit consolidates the two tests into a single `import-cancellation` roachtest. Informs cockroachdb#97869. Epic: None Release note: None
1 parent 1f8fa96 commit 0946522

File tree

1 file changed

+15
-28
lines changed

1 file changed

+15
-28
lines changed

pkg/cmd/roachtest/tests/import_cancellation.go

Lines changed: 15 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -29,27 +29,23 @@ import (
2929
)
3030

3131
func registerImportCancellation(r registry.Registry) {
32-
for _, rangeTombstones := range []bool{true, false} {
33-
r.Add(registry.TestSpec{
34-
Name: fmt.Sprintf(`import-cancellation/rangeTs=%t`, rangeTombstones),
35-
Owner: registry.OwnerDisasterRecovery,
36-
Benchmark: true,
37-
Timeout: 4 * time.Hour,
38-
Cluster: r.MakeClusterSpec(6, spec.CPU(32)),
39-
Leases: registry.MetamorphicLeases,
40-
Run: func(ctx context.Context, t test.Test, c cluster.Cluster) {
41-
if c.Spec().Cloud != spec.GCE {
42-
t.Skip("uses gs://cockroach-fixtures; see https://github.com/cockroachdb/cockroach/issues/105968")
43-
}
44-
runImportCancellation(ctx, t, c, rangeTombstones)
45-
},
46-
})
47-
}
32+
r.Add(registry.TestSpec{
33+
Name: `import-cancellation`,
34+
Owner: registry.OwnerDisasterRecovery,
35+
Benchmark: true,
36+
Timeout: 4 * time.Hour,
37+
Cluster: r.MakeClusterSpec(6, spec.CPU(32)),
38+
Leases: registry.MetamorphicLeases,
39+
Run: func(ctx context.Context, t test.Test, c cluster.Cluster) {
40+
if c.Spec().Cloud != spec.GCE {
41+
t.Skip("uses gs://cockroach-fixtures; see https://github.com/cockroachdb/cockroach/issues/105968")
42+
}
43+
runImportCancellation(ctx, t, c)
44+
},
45+
})
4846
}
4947

50-
func runImportCancellation(
51-
ctx context.Context, t test.Test, c cluster.Cluster, rangeTombstones bool,
52-
) {
48+
func runImportCancellation(ctx context.Context, t test.Test, c cluster.Cluster) {
5349
c.Put(ctx, t.Cockroach(), "./cockroach")
5450
c.Put(ctx, t.DeprecatedWorkload(), "./workload") // required for tpch
5551
c.Start(ctx, t.L(), option.DefaultStartOpts(), install.MakeClusterSettings())
@@ -81,15 +77,6 @@ func runImportCancellation(
8177
if _, err := conn.Exec(`SET CLUSTER SETTING kv.bulk_ingest.max_index_buffer_size = '2gb'`); err != nil {
8278
t.Fatal(err)
8379
}
84-
// Enable MVCC Range tombstones, if required.
85-
rtEnable := "f"
86-
if rangeTombstones {
87-
rtEnable = "t"
88-
}
89-
stmt := fmt.Sprintf(`SET CLUSTER SETTING storage.mvcc.range_tombstones.enabled = '%s'`, rtEnable)
90-
if _, err := conn.Exec(stmt); err != nil {
91-
t.Fatal(err)
92-
}
9380

9481
seed := int64(1666467482296309000)
9582
rng := randutil.NewTestRandWithSeed(seed)

0 commit comments

Comments
 (0)