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-23.1: server, statusccl: de-flake span stats fan-out tests #106636

Merged
merged 1 commit into from
Jul 12, 2023
Merged

release-23.1: server, statusccl: de-flake span stats fan-out tests #106636

merged 1 commit into from
Jul 12, 2023

Conversation

blathers-crl[bot]
Copy link

@blathers-crl blathers-crl bot commented Jul 11, 2023 •
edited by knz
Loading

Backport 1/1 commits from #106551 on behalf of @zachlite.

/cc @cockroachdb/release

This commit fixes flaky behavior while running
TestSpanStatsFanOut and TestTenantSpanStats under stress.

Both tests have been updated to ensure the following behavior:

  • The tests make sure range splits occur before proceeding.
  • The tests will retry their assertions to give the new key-value pairs time to replicate.

Additionally, NewTestTenantHelper was updated to accept a parameter for the number of nodes in the test host cluster. TestTenantSpanStats now uses a 3-node cluster to test a real fan-out.

Resolves #99770
Resolves #99559
Epic:none
Release note: None

Release justification: removes test flakes

@zachlite
server, statusccl: de-flake span stats fan-out tests
555c5e6 
This commit fixes flaky behavior while running
`TestSpanStatsFanOut` and `TestTenantSpanStats` under stress.

Both tests have been updated to ensure the following behavior:
- The tests make sure range splits occur before proceeding.
- The tests will retry their assertions to give the new key-value pairs
time to replicate.

Additionally, `NewTestTenantHelper` was updated to accept a parameter
for the number of nodes in the test host cluster. `TestTenantSpanStats`
now uses a 3-node cluster to test a real fan-out.

Resolves #99770
Resolves #99559
Epic:none
Release note: None
@blathers-crl blathers-crl bot requested a review from a team July 11, 2023 22:41
@blathers-crl blathers-crl bot requested review from a team as code owners July 11, 2023 22:41
@blathers-crl blathers-crl bot force-pushed the blathers/backport-release-23.1-106551 branch from 6adb8d3 to 4017860 Compare July 11, 2023 22:41
@blathers-crl blathers-crl bot added blathers-backport This is a backport that Blathers created automatically. O-robot Originated from a bot. labels Jul 11, 2023
@blathers-crl blathers-crl bot force-pushed the blathers/backport-release-23.1-106551 branch from ec6c1c4 to 555c5e6 Compare July 11, 2023 22:41
@blathers-crl
Copy link
Author

blathers-crl bot commented Jul 11, 2023 •
edited by knz
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

maryliag
maryliag approved these changes Jul 11, 2023
View reviewed changes
Copy link
Contributor

@maryliag maryliag left a comment

Choose a reason for hiding this comment

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

can you update the issue to show the one from 23.1 that is getting fixed by this PR?
otherwise
:lgtm:

Reviewable status: :shipit: complete! 1 of 0 LGTMs obtained (waiting on @zachlite)

@knz
Copy link
Contributor

knz commented Jul 12, 2023

can you update the issue to show the one from 23.1 that is getting fixed by this PR?

It's #99770.

@knz knz merged commit 7496dba into release-23.1 Jul 12, 2023
@knz knz deleted the blathers/backport-release-23.1-106551 branch July 12, 2023 07:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@maryliag maryliag maryliag approved these changes

Assignees

@zachlite zachlite

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 @knz @maryliag @zachlite