Merge #108487

108487: roachtest: remove rangeTs clearrange variants r=jbowens a=jbowens In clusters with finalized cluster versions ≥23.1, range tombstones are always enabled and the cluster setting has no effect. Remove the variations of the clearrange test, and we'll effectively always test with MVCC range tombstones. Epic: none Informs #97869. Release note: none Co-authored-by: Jackson Owens <[email protected]>
cockroachdb · Aug 10, 2023 · 00f1d4e · 00f1d4e
2 parents a598a75 + 6c636d8
commit 00f1d4e
Showing 1 changed file with 16 additions and 35 deletions.
diff --git a/pkg/cmd/roachtest/tests/clearrange.go b/pkg/cmd/roachtest/tests/clearrange.go
@@ -26,28 +26,25 @@ import (
 
 func registerClearRange(r registry.Registry) {
 	for _, checks := range []bool{true, false} {
-		for _, rangeTombstones := range []bool{true, false} {
-			checks := checks
-			rangeTombstones := rangeTombstones
-			r.Add(registry.TestSpec{
-				Name:  fmt.Sprintf(`clearrange/checks=%t/rangeTs=%t`, checks, rangeTombstones),
-				Owner: registry.OwnerStorage,
-				// 5h for import, 90 for the test. The import should take closer
-				// to <3:30h but it varies.
-				Timeout: 5*time.Hour + 90*time.Minute,
-				Cluster: r.MakeClusterSpec(10, spec.CPU(16)),
-				Leases:  registry.MetamorphicLeases,
-				Run: func(ctx context.Context, t test.Test, c cluster.Cluster) {
-					runClearRange(ctx, t, c, checks, rangeTombstones)
-				},
-			})
-		}
+		checks := checks
+		r.Add(registry.TestSpec{
+			Name:  fmt.Sprintf(`clearrange/checks=%t`, checks),
+			Owner: registry.OwnerStorage,
+			// 5h for import, 90 for the test. The import should take closer
+			// to <3:30h but it varies.
+			Timeout: 5*time.Hour + 90*time.Minute,
+			Cluster: r.MakeClusterSpec(10, spec.CPU(16)),
+			Leases:  registry.MetamorphicLeases,
+			Run: func(ctx context.Context, t test.Test, c cluster.Cluster) {
+				runClearRange(ctx, t, c, checks)
+			},
+		})
 	}
 	// Using a separate clearrange test on zfs instead of randomly
 	// using the same test, cause the Timeout might be different,
 	// and may need to be tweaked.
 	r.Add(registry.TestSpec{
-		Name:  `clearrange/zfs/checks=true/rangeTs=true`,
+		Name:  `clearrange/zfs/checks=true`,
 		Owner: registry.OwnerStorage,
 		// 5h for import, 120 for the test. The import should take closer
 		// to <3:30h but it varies.
@@ -56,33 +53,17 @@ func registerClearRange(r registry.Registry) {
 		EncryptionSupport: registry.EncryptionMetamorphic,
 		Leases:            registry.MetamorphicLeases,
 		Run: func(ctx context.Context, t test.Test, c cluster.Cluster) {
-			runClearRange(ctx, t, c, true /* checks */, true /* rangeTombstones */)
+			runClearRange(ctx, t, c, true /* checks */)
 		},
 	})
 }
 
-func runClearRange(
-	ctx context.Context,
-	t test.Test,
-	c cluster.Cluster,
-	aggressiveChecks bool,
-	useRangeTombstones bool,
-) {
+func runClearRange(ctx context.Context, t test.Test, c cluster.Cluster, aggressiveChecks bool) {
 	c.Put(ctx, t.Cockroach(), "./cockroach")
 
 	t.Status("restoring fixture")
 	c.Start(ctx, t.L(), option.DefaultStartOpts(), install.MakeClusterSettings())
 
-	{
-		conn := c.Conn(ctx, t.L(), 1)
-		if _, err := conn.ExecContext(ctx,
-			`SET CLUSTER SETTING storage.mvcc.range_tombstones.enabled = $1`,
-			useRangeTombstones); err != nil {
-			t.Fatal(err)
-		}
-		conn.Close()
-	}
-
 	// NB: on a 10 node cluster, this should take well below 3h.
 	tBegin := timeutil.Now()
 	c.Run(ctx, c.Node(1), "./cockroach", "workload", "fixtures", "import", "bank",