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.1: sql: fixes around accounting of prepared statements #84207

Merged
merged 3 commits into from
Jul 15, 2022
Merged

release-22.1: sql: fixes around accounting of prepared statements #84207

merged 3 commits into from
Jul 15, 2022

Conversation

yuzefovich
Copy link
Member

Backport:

Please see individual PRs for details.

/cc @cockroachdb/release

Release justification: bug fixes.

@yuzefovich
sql: don't clear the memory account of the prepared stmt
11c67d9 
Previously, we had a bug of clearing the memory account of the prepared
statements right after that prepared statement is created although we do
keep the struct around. I believe this bug was introduced long time ago,
and it could result in some memory not being accounted for. This is now
fixed.

Release note: None
@yuzefovich
sql: make sure to close mem acc of prepared stmt in case of an error
2da165c 
Previously, it was possible that we would not close the memory account
created for a prepared statement when an error is encountered. This was
the case because we would not include the prepared stmt into the prep
stmts namespace, so it would just get lost. However, up until recently
this was not an issue since we mistakenly cleared that memory account
when creating the prepared statement.

Release note: None
@yuzefovich
sql: only increment ref count of prep stmt in non-error case of portals
dc1b485 
Previously, it was possible to "leak" a reference to a prepared
statement if we made a portal from it (i.e. took a reference to the
prepared statement) and the memory reservation was denied. This could
lead to "leftover bytes" errors when stopping the "session" monitors.
However, the impact is minor because on release builds we'd still return
those "leftover bytes" and would just file a sentry issue. This is now
fixed.

Release note: None
@blathers-crl
Copy link

blathers-crl bot commented Jul 11, 2022 •
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

@yuzefovich yuzefovich mentioned this pull request Jul 11, 2022
Closed
DrewKimball
DrewKimball approved these changes Jul 12, 2022
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:

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

@yuzefovich yuzefovich merged commit 7c33e5e into cockroachdb:release-22.1 Jul 15, 2022
@yuzefovich yuzefovich deleted the backport22.1-83615-84049 branch July 15, 2022 00:23
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

@cucaroach cucaroach Awaiting requested review from cucaroach

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

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