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

Jump to bottom

release-22.2: multitenant: deflake TestConsumption #107784

Merged
merged 1 commit into from
Aug 1, 2023
Merged

release-22.2: multitenant: deflake TestConsumption #107784

merged 1 commit into from
Aug 1, 2023

Conversation

blathers-crl[bot]
Copy link

@blathers-crl blathers-crl bot commented Jul 28, 2023 •
edited by yuzefovich
Loading

Backport 1/1 commits from #105552 on behalf of @DrewKimball.

/cc @cockroachdb/release

This patch adds retries to the TestConsumption test for retrieving the total tenant RU consumption in order to ensure that the delta includes the bucket flush that was triggered by the test query, instead of background activity.

Fixes #94286
Fixes #106572

Release note: None

Release justification: test-only change.

@DrewKimball
multitenant: deflake TestConsumption
96da87f 
This patch adds retries to the `TestConsumption` test for retrieving the
total tenant RU consumption in order to ensure that the delta includes the
bucket flush that was triggered by the test query, instead of background
activity.

Fixes #94286
Fixes #106572

Release note: None
@blathers-crl blathers-crl bot requested a review from a team as a code owner July 28, 2023 12:46
@blathers-crl blathers-crl bot force-pushed the blathers/backport-release-22.2-105552 branch from 527c839 to 88d20ee Compare July 28, 2023 12:46
@blathers-crl blathers-crl bot added blathers-backport This is a backport that Blathers created automatically. O-robot Originated from a bot. labels Jul 28, 2023
@blathers-crl blathers-crl bot force-pushed the blathers/backport-release-22.2-105552 branch from 04c1387 to 96da87f Compare July 28, 2023 12:46
@blathers-crl
Copy link
Author

blathers-crl bot commented Jul 28, 2023 •
edited by yuzefovich
Loading

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

DrewKimball
DrewKimball approved these changes Jul 28, 2023
View reviewed changes
Copy link
Collaborator

@DrewKimball DrewKimball left a comment

Choose a reason for hiding this comment

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

:lgtm:

Reviewed 1 of 1 files at r1, all commit messages.
Reviewable status: :shipit: complete! 1 of 0 LGTMs obtained (waiting on @rharding6373 and @yuzefovich)

rharding6373
rharding6373 approved these changes Aug 1, 2023
View reviewed changes
Copy link
Collaborator

@rharding6373 rharding6373 left a comment

Choose a reason for hiding this comment

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

:lgtm:

Reviewable status: :shipit: complete! 2 of 0 LGTMs obtained (waiting on @yuzefovich)

@yuzefovich yuzefovich merged commit 88b9be5 into release-22.2 Aug 1, 2023
@yuzefovich yuzefovich deleted the blathers/backport-release-22.2-105552 branch August 1, 2023 18:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@DrewKimball DrewKimball DrewKimball approved these changes

@rharding6373 rharding6373 rharding6373 approved these changes

@yuzefovich yuzefovich Awaiting requested review from yuzefovich

Assignees

@DrewKimball DrewKimball

Labels
blathers-backport This is a backport that Blathers created automatically. O-robot Originated from a bot.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@cockroach-teamcity @rharding6373 @DrewKimball @yuzefovich