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.

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

release-22.2: statusccl: unskip and de-flake testTenantRanges #106710

Conversation

zachlite
Copy link
Contributor

@zachlite zachlite commented Jul 12, 2023

Superscedes #106632.

This is a 22.2 compatible work around for the flake fix introduced in #99054.

In 22.2, crdb_internal.ranges is not yet compatible with secondary tenants, so instead we rely on TenantRanges itself with the limit param omitted.

The method is the same: we count the number of ranges that belong to the tenant and only proceed when we know there are enough ranges for subsequent calls with pagination to succeed.

Resolves #92382
Epic: none
Release note: None


Release justification: flake fix

This is a 22.2 compatible work around for the flake fix introduced in cockroachdb#99054.

In 22.2, crdb_internal.ranges is not yet compatible with
secondary tenants, so instead we rely on TenantRanges
itself with the `limit` param omitted.

The method is the same: we count the number of ranges that belong
to the tenant and only proceed when we know there are enough ranges
for subsequent calls with pagination to succeed.

Resolves cockroachdb#92382
Epic: none
Release note: None
@zachlite zachlite requested review from a team July 12, 2023 18:12
@zachlite zachlite requested a review from a team as a code owner July 12, 2023 18:12
@blathers-crl
Copy link

blathers-crl bot commented Jul 12, 2023

Thanks for opening a backport.

Please check the backport criteria before merging:

  • Patches should only be created for serious issues or test-only changes.
  • Patches should not break backwards-compatibility.
  • Patches should change as little code as possible.
  • Patches should not change on-disk formats or node communication protocols.
  • Patches should not add new functionality.
  • Patches must not add, edit, or otherwise modify cluster versions; or add version gates.
If some of the basic criteria cannot be satisfied, ensure that the exceptional criteria are satisfied within.
  • There is a high priority need for the functionality that cannot wait until the next release and is difficult to address in another way.
  • The new functionality is additive-only and only runs for clusters which have specifically “opted in” to it (e.g. by a cluster setting).
  • New code is protected by a conditional check that is trivial to verify and ensures that it only runs for opt-in clusters.
  • The PM and TL on the team that owns the changed code have signed off that the change obeys the above rules.

Add a brief release justification to the body of your PR to justify this backport.

Some other things to consider:

  • What did we do to ensure that a user that doesn’t know & care about this backport, has no idea that it happened?
  • Will this work in a cluster of mixed patch versions? Did we test that?
  • If a user upgrades a patch version, uses this feature, and then downgrades, what happens?

@cockroach-teamcity
Copy link
Member

This change is Reviewable

Copy link
Contributor

@knz knz left a comment

Choose a reason for hiding this comment

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

nice

@zachlite
Copy link
Contributor Author

TFTR

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants