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-23.2: sqlstats: add retries to stats test on locked table #120010

Merged
merged 1 commit into from
Mar 18, 2024

Conversation

blathers-crl[bot]
Copy link

@blathers-crl blathers-crl bot commented Mar 6, 2024

Backport 1/1 commits from #119977 on behalf of @dhartunian.

/cc @cockroachdb/release


Previously, the TestSQLStatsReadLimitSizeOnLockedTable test would fail very occasionally due to a rare scenario. When stats are written, they contain a column that's a hashed shard index. It's expected that statements are uniformly distributed across this shard, but that's not guaranteed. Later in the test we check a random shard to make sure its stats count exceeds a minimum of 1 (because we place a total lower bound of 8 in the cluster setting, which is then divided by 8 to derive the per-shard limit). This case will occasionally fail if the random shard that's picked happens to only contain a single statement within.

This change modifies the loop at the end of the test to expect a false value and make sure to get at least a single true result after 3 iterations, instead of requiring 3 true results every single time. The requirement that the queries run despite contention will still stand since we'll return an error in that case.

Resolves: #119067
Epic: None

Release note: None


Release justification:

Previously, the `TestSQLStatsReadLimitSizeOnLockedTable` test would
fail very occasionally due to a rare scenario. When stats are written,
they contain a column that's a hashed shard index. It's expected that
statements are uniformly distributed across this shard, but that's
not guaranteed. Later in the test we check a random shard to make
sure its stats count exceeds a minimum of 1 (because we place a total
lower bound of 8 in the cluster setting, which is then divided by 8 to
derive the per-shard limit). This case will occasionally fail if the
random shard that's picked happens to only contain a single statement
within.

This change modifies the loop at the end of the test to expect a
`false` value and make sure to get at least a single `true` result
after 3 iterations, instead of requiring 3 `true` results every single
time. The requirement that the queries run despite contention will
still stand since we'll return an error in that case.

Resolves: #119067
Epic: None

Release note: None
@blathers-crl blathers-crl bot requested a review from a team March 6, 2024 19:50
@blathers-crl blathers-crl bot force-pushed the blathers/backport-release-23.2-119977 branch from b3ecbb3 to 10aaf5a Compare March 6, 2024 19:50
@blathers-crl blathers-crl bot added blathers-backport This is a backport that Blathers created automatically. O-robot Originated from a bot. labels Mar 6, 2024
@blathers-crl blathers-crl bot requested review from dhartunian and xinhaoz March 6, 2024 19:50
Copy link
Author

blathers-crl bot commented Mar 6, 2024

Thanks for opening a backport.

Please check the backport criteria before merging:

  • Backports should only be created for serious
    issues
    or test-only changes.
  • Backports should not break backwards-compatibility.
  • Backports should change as little code as possible.
  • Backports should not change on-disk formats or node communication protocols.
  • Backports should not add new functionality (except as defined
    here).
  • Backports must not add, edit, or otherwise modify cluster versions; or add version gates.
  • All backports must be reviewed by the owning areas TL and one additional
    TL. For more information as to how that review should be conducted, please consult the backport
    policy
    .
If your backport adds new functionality, please ensure that the following additional criteria are satisfied:
  • 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. State changes must be further protected such that nodes running old binaries will not be negatively impacted by the new state (with a mixed version test added).
  • The PM and TL on the team that owns the changed code have signed off that the change obeys the above rules.
  • Your backport must be accompanied by a post to the appropriate Slack
    channel (#db-backports-point-releases or #db-backports-XX-X-release) for awareness and discussion.

Also, please add a brief release justification to the body of your PR to justify this
backport.

@blathers-crl blathers-crl bot added the backport Label PR's that are backports to older release branches label Mar 6, 2024
@cockroach-teamcity
Copy link
Member

This change is Reviewable

@dhartunian dhartunian merged commit e72f424 into release-23.2 Mar 18, 2024
4 of 6 checks passed
@dhartunian dhartunian deleted the blathers/backport-release-23.2-119977 branch March 18, 2024 13:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport Label PR's that are backports to older release branches blathers-backport This is a backport that Blathers created automatically. O-robot Originated from a bot.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants