diff --git a/pkg/cmd/roachtest/roachtestutil/mixedversion/mixedversion.go b/pkg/cmd/roachtest/roachtestutil/mixedversion/mixedversion.go index b8f144a027cd..344f750c42ea 100644 --- a/pkg/cmd/roachtest/roachtestutil/mixedversion/mixedversion.go +++ b/pkg/cmd/roachtest/roachtestutil/mixedversion/mixedversion.go @@ -210,6 +210,11 @@ var ( // would *not* make the tenant auto upgrade. tenantSupportsAutoUpgradeVersion = clusterupgrade.MustParseVersion("v24.2.0-alpha.00000000") + // updateTenantResourceLimitsDeprecatedArgsVersion is the lowest version + // after which the "as_of" and "as_of_consumed_tokens" arguments were removed when + // using the `tenant_name` overload. + updateTenantResourceLimitsDeprecatedArgsVersion = clusterupgrade.MustParseVersion("v24.2.1") + // Catch divergences between `stepFunc` and `Run`'s signature in // `singleStepProtocol` at compile time. _ = func() stepFunc { diff --git a/pkg/cmd/roachtest/roachtestutil/mixedversion/steps.go b/pkg/cmd/roachtest/roachtestutil/mixedversion/steps.go index e7ddee2534f2..6674b1885893 100644 --- a/pkg/cmd/roachtest/roachtestutil/mixedversion/steps.go +++ b/pkg/cmd/roachtest/roachtestutil/mixedversion/steps.go @@ -590,10 +590,17 @@ func (s disableRateLimitersStep) Run( // to outright disable the tenant rate limiter. Instead, we instead set the tenant's // resource limits to an arbitrarily high value. stmt = fmt.Sprintf( - "SELECT crdb_internal.update_tenant_resource_limits('%s', %v, %v, %d, now(), 0);", + "SELECT crdb_internal.update_tenant_resourcet_limits('%s', %v, %v, %d, now(), 0);", s.virtualClusterName, availableTokens, refillRate, maxBurstTokens, ) + if h.System.FromVersion.AtLeast(updateTenantResourceLimitsDeprecatedArgsVersion) { + stmt = fmt.Sprintf( + "SELECT crdb_internal.update_tenant_resource_limits('%s', %v, %v, %d);", + s.virtualClusterName, availableTokens, refillRate, maxBurstTokens, + ) + } + return h.System.Exec(rng, stmt) }