distsql: restore EvalCtx.Mon on the flow cleanup #69483
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
This change is |
rytaft
approved these changes
Aug 27, 2021
There was a problem hiding this comment.
Reviewed 2 of 2 files at r1, 1 of 1 files at r2, all commit messages.
Reviewable status:complete! 1 of 0 LGTMs obtained (waiting on @yuzefovich)
In `setupFlow`, if we're setting up a flow on the gateway, we're using `LocalState` to save on deserialization of some state. Notably, we pass the eval context that we used during the physical planning. That eval context can be mutated (in particular, we're updating its `Mon` field to the "flow" memory monitor), and previously this could cause issues when automatically retrying stats collection jobs (possibly there could be other issues). This commit introduces a callback to restore the local eval context to its original state which is done on the flow cleanup. Release note (bug fix): Previously, table stats collection issued via `ANALYZE` statement or via `CREATE STATISTICS` statement without specifying `AS OF SYSTEM TIME` option could run into `flow: memory budget exceeded`, and this has been fixed. Release justification: fix to a long standing bug.
Release note: None Release justification: low-risk improvement to resources' cleanup in an edge case.
yuzefovich
force-pushed
the
restore-mon
branch
from
ca4bbd5
to
cf8acbf
Compare
michae2
approved these changes
Aug 27, 2021
There was a problem hiding this comment.
Reviewable status:
|
TFTRs! bors r+ |
|
Build succeeded: |
This was referenced Aug 30, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
distsql: restore EvalCtx.Mon on the flow cleanup
In
setupFlow, if we're setting up a flow on the gateway, we're usingLocalStateto save on deserialization of some state. Notably, we passthe eval context that we used during the physical planning. That eval
context can be mutated (in particular, we're updating its
Monfield tothe "flow" memory monitor), and previously this could cause issues when
automatically retrying stats collection jobs (possibly there could be
other issues).
This commit introduces a callback to restore the local eval context to
its original state which is done on the flow cleanup.
Fixes: #68670.
Fixes: #67113.
Release note (bug fix): Previously, table stats collection issued via
ANALYZEstatement or viaCREATE STATISTICSstatement withoutspecifying
AS OF SYSTEM TIMEoption could run intoflow: memory budget exceeded, and this has been fixed.Release justification: fix to a long standing bug.
distsql: fix cleaning up resources in an error case in setupFlow
Release note: None
Release justification: low-risk improvement to resources' cleanup in an
edge case.