-
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-23.1.0: distsql: fix sql.mem.distsql.current metric #101311
Closed
blathers-crl
wants to merge
3
commits into
release-23.1.0
from
blathers/backport-release-23.1.0-99887
Closed
release-23.1.0: distsql: fix sql.mem.distsql.current metric #101311
blathers-crl
wants to merge
3
commits into
release-23.1.0
from
blathers/backport-release-23.1.0-99887
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
As of 961e66f we no longer need to create memory monitors and accounts for sub- and post-queries so this commit removes them. Release note: None
This locking is no longer needed as of 472e740. Release note: None
This commit fixes double counting of remote DistSQL flows' memory usage against `sql.mem.distsql.current` metric. This was the case since we passed the metric to both the `flow` monitor (created for all flows, both local and remote) and the `distsql` monitor (which tracks the memory usage of all remote flows). This is now fixed by only passing the metric in the former case. Release note (bug fix): Previously, `sql.mem.distsql.current` metric would double count the memory usage of remote DistSQL flows and this has been fixed.
blathers-crl
bot
force-pushed
the
blathers/backport-release-23.1.0-99887
branch
from
April 12, 2023 13:44
30c70ea
to
88540cd
Compare
blathers-crl
bot
force-pushed
the
blathers/backport-release-23.1.0-99887
branch
from
April 12, 2023 13:44
e6f3f87
to
c4feac3
Compare
blathers-crl
bot
added
blathers-backport
This is a backport that Blathers created automatically.
O-robot
Originated from a bot.
labels
Apr 12, 2023
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:
|
It looks like your PR touches production code but doesn't add or edit any test code. Did you consider adding tests to your PR? 🦉 Hoot! I am a Blathers, a bot for CockroachDB. My owner is dev-inf. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
blathers-backport
This is a backport that Blathers created automatically.
O-robot
Originated from a bot.
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.
Backport 3/3 commits from #99887 on behalf of @yuzefovich.
/cc @cockroachdb/release
sql: don't create unused monitor and account
As of 961e66f we no longer need to
create memory monitors and accounts for sub- and post-queries so this
commit removes them.
Release note: None
util/mon: remove redundant locking in NewMonitorInheritWithLimit
This locking is no longer needed as of 472e740.
Release note: None
distsql: fix sql.mem.distsql.current metric
This commit fixes double counting of remote DistSQL flows' memory usage
against
sql.mem.distsql.current
metric. This was the case since wepassed the metric to both the
flow
monitor (created for all flows,both local and remote) and the
distsql
monitor (which tracks thememory usage of all remote flows). This is now fixed by only passing the
metric in the former case.
Fixes: #91787.
Release note (bug fix): Previously,
sql.mem.distsql.current
metricwould double count the memory usage of remote DistSQL flows and this has
been fixed.
Release justification: