-
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: distsql: fix sql.mem.distsql.current metric #100049
release-23.1: distsql: fix sql.mem.distsql.current metric #100049
Conversation
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.
0195a58
to
5aed635
Compare
5aed635
to
518b73d
Compare
75e47b3
to
c11be6c
Compare
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. |
This can wait for 23.1.1. |
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 1 of 1 files at r1, 1 of 1 files at r2, 4 of 4 files at r3, all commit messages.
Reviewable status: complete! 1 of 0 LGTMs obtained (waiting on @yuzefovich)
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: bug fix.