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: stmtdiagnostics: save the bundle on a statement timeout #89129

Merged
merged 1 commit into from Oct 4, 2022
Merged

release-22.2: stmtdiagnostics: save the bundle on a statement timeout #89129

merged 1 commit into from Oct 4, 2022

Conversation

blathers-crl[bot]
Copy link

@blathers-crl blathers-crl bot commented Sep 30, 2022 •
edited by yuzefovich

Backport 1/1 commits from #88080 on behalf of @yuzefovich.

/cc @cockroachdb/release

Previously if the traced statement is canceled due to a statement timeout, the statement bundle would be created but would fail on the insertion into the system table. This is suboptimal because we already did all the work to collect the bundle as well as it might be desired to see the partial trace, so this commit makes it so that the bundle is saved correctly.

Fixes: #73477.

Release note (bug fix): Previously, when a statement bundle was collected for a query that results in an error due to a statement_timeout, the bundle would not be saved, and this is now fixed.

Release justification: bug fix.

@yuzefovich
stmtdiagnostics: save the bundle on a statement timeout
18a8858 
Previously if the traced statement is canceled due to a statement
timeout, the statement bundle would be created but would fail on the
insertion into the system table. This is suboptimal because we already
did all the work to collect the bundle as well as it might be desired to
see the partial trace, so this commit makes it so that the bundle is
saved correctly.

Release note (bug fix): Previously, when a statement bundle was
collected for a query that results in an error due to
a `statement_timeout`, the bundle would not be saved, and this is now
fixed.
@blathers-crl blathers-crl bot force-pushed the blathers/backport-release-22.2-88080 branch from 1e746c3 to 18a8858 Compare September 30, 2022 22:12
@blathers-crl
Copy link
Author

blathers-crl bot commented Sep 30, 2022 •
edited by yuzefovich

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 blathers-backport This is a backport that Blathers created automatically. O-robot Originated from a bot. labels Sep 30, 2022
@cockroach-teamcity
Copy link
Member

This change is Reviewable

@yuzefovich
Copy link
Member

This can wait for 22.2.1.

@yuzefovich yuzefovich added the do-not-merge bors won't merge a PR with this label. label Sep 30, 2022
rytaft
rytaft approved these changes Sep 30, 2022
View reviewed changes
Copy link
Collaborator

@rytaft rytaft 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 3 of 3 files at r1, all commit messages.
Reviewable status: :shipit: complete! 1 of 0 LGTMs obtained (waiting on @cucaroach and @yuzefovich)

@yuzefovich yuzefovich removed the do-not-merge bors won't merge a PR with this label. label Oct 4, 2022
@yuzefovich yuzefovich merged commit 17beee1 into release-22.2 Oct 4, 2022
@yuzefovich yuzefovich deleted the blathers/backport-release-22.2-88080 branch October 4, 2022 16:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rytaft rytaft rytaft approved these changes

@cucaroach cucaroach Awaiting requested review from cucaroach

@yuzefovich yuzefovich Awaiting requested review from yuzefovich

Assignees

@yuzefovich yuzefovich

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.

None yet
3 participants
@cockroach-teamcity @yuzefovich @rytaft