-
Notifications
You must be signed in to change notification settings - Fork 3.8k
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-21.2: pgwire: fix buffer size limiting behavior for addBatch #84921
release-21.2: pgwire: fix buffer size limiting behavior for addBatch #84921
Conversation
Previously, the size of the buffer used to store results before sending them to the client was checked after buffering each batch entirely. This could result in significantly exceeding the buffer memory limit when a batch had wide rows on average. This patch modifies the pwire logic to ensure that `maybeFlush` is called each time a row is buffered. This ensures that the pre-21.2 behavior is preserved. Fixes cockroachdb#83837 Release note (bug fix): Fixed a bug that was introduced in release 21.2 that could cause increased memory usage when scanning a table with wide rows.
Thanks for opening a backport. Please check the backport criteria before merging:
If some of the basic criteria cannot be satisfied, ensure that the exceptional criteria are satisfied within.
Add a brief release justification to the body of your PR to justify this backport. Some other things to consider:
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Reviewed 2 of 2 files at r1, all commit messages.
Reviewable status: complete! 1 of 0 LGTMs obtained (waiting on @DrewKimball)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for backporting! You'll just need to add a release justification to the PR description.
@DrewKimball @yuzefovich Should we merge this today to get it into 21.2.14? |
Yes, it'd be good. |
👍 Thanks! |
Backport 1/1 commits from #83870.
/cc @cockroachdb/release
Previously, the size of the buffer used to store results before sending them
to the client was checked after buffering each batch entirely. This could
result in significantly exceeding the buffer memory limit when a batch had wide
rows on average.
This patch modifies the pwire logic to ensure that
maybeFlush
is called eachtime a row is buffered. This ensures that the pre-21.2 behavior is preserved.
Fixes #83837
Release note (bug fix): Fixed a bug that was introduced in release 21.2 that
could cause increased memory usage when scanning a table with wide rows.
Release justification: bug fix.