Skip to content

roachtest: fix configureGCPolicies to use system connection for zone config #169762

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

Draft
cockroach-teamcity wants to merge 1 commit into
base: master
Choose a base branch
from
+20 −6
Draft

roachtest: fix configureGCPolicies to use system connection for zone config #169762

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
26 changes: 20 additions & 6 deletions pkg/cmd/roachtest/tests/mixed_version_backup.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,17 +229,31 @@ func (mvb *mixedVersionBackup) configureGCPolicies(
if err := mvb.waitForDBs(ctx, l, rng, h); err != nil {
return err
}
u, err := mvb.CommonTestUtils(ctx, h)
if err != nil {
return err
}
// The bank workload is an update-heavy workload, which means that by the end
// of the test, full revision history backups will be slowed significantly due
// to the amount of MVCC history. We set a shorter GC TTL for the bank
// database to bound the full backup durations.
//
// The bank database lives in the tenant, so we must configure zone
// settings through the tenant connection. In older versions (pre-24.1),
// zone configs must be explicitly enabled for virtual clusters.
if h.IsMultitenant() && !h.Context().FromVersion.AtLeast(mixedversion.TenantsAndSystemAlignedSettingsVersion) {
for _, name := range []string{
"sql.virtual_cluster.feature_access.zone_configs.enabled",
Copy link
Copy Markdown
Contributor

@dt dt May 6, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

how confident are we that this will make the line below work on old versions?

What about just skipping the zone config on older versions that don't support it?

Copy link
Copy Markdown
Contributor

@dt dt May 6, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

autosover: ping?

"sql.virtual_cluster.feature_access.zone_configs_unrestricted.enabled",
} {
if err := h.System.Exec(
rng,
fmt.Sprintf(`ALTER TENANT $1 SET CLUSTER SETTING %s = $2`, name),
h.Tenant.Descriptor.Name, true,
); err != nil {
return errors.Wrapf(err, "setting %s", name)
}
}
}
const bankTTLSeconds = uint64(2 * time.Hour / time.Second)
return u.Exec(
ctx, rng, `ALTER DATABASE bank CONFIGURE ZONE USING gc.ttlseconds = $1`, bankTTLSeconds,
return h.Exec(
rng, `ALTER DATABASE bank CONFIGURE ZONE USING gc.ttlseconds = $1`, bankTTLSeconds,
)
}

Expand Down
Loading