Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

roachtest: remove rangeTs clearrange variants #108487

Merged
merged 1 commit into from
Aug 10, 2023
Merged

roachtest: remove rangeTs clearrange variants #108487

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 16 additions & 35 deletions pkg/cmd/roachtest/tests/clearrange.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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",
Expand Down