From 0946522c1fdeba700416e5f1e6e6117c78ff127b Mon Sep 17 00:00:00 2001
From: Jackson Owens <jackson@cockroachlabs.com>
Date: Thu, 10 Aug 2023 13:26:24 -0400
Subject: [PATCH] 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 #97869.
Epic: None
Release note: None
---
 .../roachtest/tests/import_cancellation.go    | 43 +++++++------------
 1 file changed, 15 insertions(+), 28 deletions(-)

diff --git a/pkg/cmd/roachtest/tests/import_cancellation.go b/pkg/cmd/roachtest/tests/import_cancellation.go
index d6f3e8f0696c..e9ac200e21f2 100644
--- a/pkg/cmd/roachtest/tests/import_cancellation.go
+++ b/pkg/cmd/roachtest/tests/import_cancellation.go
@@ -29,27 +29,23 @@ import (
 )
 
 func registerImportCancellation(r registry.Registry) {
-	for _, rangeTombstones := range []bool{true, false} {
-		r.Add(registry.TestSpec{
-			Name:      fmt.Sprintf(`import-cancellation/rangeTs=%t`, rangeTombstones),
-			Owner:     registry.OwnerDisasterRecovery,
-			Benchmark: true,
-			Timeout:   4 * time.Hour,
-			Cluster:   r.MakeClusterSpec(6, spec.CPU(32)),
-			Leases:    registry.MetamorphicLeases,
-			Run: func(ctx context.Context, t test.Test, c cluster.Cluster) {
-				if c.Spec().Cloud != spec.GCE {
-					t.Skip("uses gs://cockroach-fixtures; see https://github.com/cockroachdb/cockroach/issues/105968")
-				}
-				runImportCancellation(ctx, t, c, rangeTombstones)
-			},
-		})
-	}
+	r.Add(registry.TestSpec{
+		Name:      `import-cancellation`,
+		Owner:     registry.OwnerDisasterRecovery,
+		Benchmark: true,
+		Timeout:   4 * time.Hour,
+		Cluster:   r.MakeClusterSpec(6, spec.CPU(32)),
+		Leases:    registry.MetamorphicLeases,
+		Run: func(ctx context.Context, t test.Test, c cluster.Cluster) {
+			if c.Spec().Cloud != spec.GCE {
+				t.Skip("uses gs://cockroach-fixtures; see https://github.com/cockroachdb/cockroach/issues/105968")
+			}
+			runImportCancellation(ctx, t, c)
+		},
+	})
 }
 
-func runImportCancellation(
-	ctx context.Context, t test.Test, c cluster.Cluster, rangeTombstones bool,
-) {
+func runImportCancellation(ctx context.Context, t test.Test, c cluster.Cluster) {
 	c.Put(ctx, t.Cockroach(), "./cockroach")
 	c.Put(ctx, t.DeprecatedWorkload(), "./workload") // required for tpch
 	c.Start(ctx, t.L(), option.DefaultStartOpts(), install.MakeClusterSettings())
@@ -81,15 +77,6 @@ func runImportCancellation(
 	if _, err := conn.Exec(`SET CLUSTER SETTING kv.bulk_ingest.max_index_buffer_size = '2gb'`); err != nil {
 		t.Fatal(err)
 	}
-	// Enable MVCC Range tombstones, if required.
-	rtEnable := "f"
-	if rangeTombstones {
-		rtEnable = "t"
-	}
-	stmt := fmt.Sprintf(`SET CLUSTER SETTING storage.mvcc.range_tombstones.enabled = '%s'`, rtEnable)
-	if _, err := conn.Exec(stmt); err != nil {
-		t.Fatal(err)
-	}
 
 	seed := int64(1666467482296309000)
 	rng := randutil.NewTestRandWithSeed(seed)