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: sqlstats: unskip tests hitting combinedstmts and stmts endpoints #110232

Merged
merged 1 commit into from
Sep 8, 2023
Merged

release-22.2: sqlstats: unskip tests hitting combinedstmts and stmts endpoints #110232

merged 1 commit into from
Sep 8, 2023

Conversation

gtr
Copy link
Contributor

@gtr gtr commented Sep 8, 2023

Backport 1/1 commits from #109381.

/cc @cockroachdb/release

Fixes: #109184.

Previously, tests which hit the combinedstmts and statements
endpoints were skipped under stress because they would occaisonally
fail. This commit unskips these tests and instead of unmarshalling the
metadata JSON blob, the select query directly extracts the values needed
from it.

Release note: None

Release justification: bug fix for customer

@gtr
sqlstats: unskip tests hitting combinedstmts and stmts endpoints
86524f2 
Fixes: cockroachdb#109184.

Previously, tests which hit the `combinedstmts` and `statements`
endpoints were skipped under stress because they would occaisonally
fail. This commit unskips these tests and instead of unmarshalling the
metadata JSON blob, the select query directly extracts the values needed
from it. The http client's timeout is also increased by 30s.

Release note: None
@blathers-crl
Copy link

blathers-crl bot commented Sep 8, 2023 •
edited by gtr
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?

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

This change is Reviewable

@gtr gtr marked this pull request as ready for review September 8, 2023 13:29
@gtr gtr requested a review from a team September 8, 2023 13:29
@gtr gtr requested a review from a team as a code owner September 8, 2023 13:29
@gtr gtr requested review from a team and dhartunian and removed request for a team September 8, 2023 13:29
@gtr gtr merged commit fd2f245 into cockroachdb:release-22.2 Sep 8, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@xinhaoz xinhaoz xinhaoz approved these changes

@dhartunian dhartunian Awaiting requested review from dhartunian

Assignees
No one assigned
Labels
backport Label PR's that are backports to older release branches
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@gtr @cockroach-teamcity @xinhaoz