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.

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

Merged
merged 3 commits into from
Apr 12, 2023

Conversation

blathers-crl[bot]
Copy link

@blathers-crl blathers-crl bot commented Mar 30, 2023

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 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.

Fixes: #91787.

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.


Release justification: bug fix.

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 blathers-crl bot requested a review from a team as a code owner March 30, 2023 07:17
@blathers-crl blathers-crl bot force-pushed the blathers/backport-release-23.1-99887 branch from 0195a58 to 5aed635 Compare March 30, 2023 07:17
@blathers-crl blathers-crl bot requested a review from yuzefovich March 30, 2023 07:17
@blathers-crl blathers-crl bot force-pushed the blathers/backport-release-23.1-99887 branch from 5aed635 to 518b73d Compare March 30, 2023 07:17
@blathers-crl blathers-crl bot requested a review from michae2 March 30, 2023 07:17
@blathers-crl blathers-crl bot force-pushed the blathers/backport-release-23.1-99887 branch from 75e47b3 to c11be6c Compare March 30, 2023 07:17
@blathers-crl blathers-crl bot added blathers-backport This is a backport that Blathers created automatically. O-robot Originated from a bot. labels Mar 30, 2023
@blathers-crl
Copy link
Author

blathers-crl bot commented Mar 30, 2023

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?

@blathers-crl
Copy link
Author

blathers-crl bot commented Mar 30, 2023

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.

@cockroach-teamcity
Copy link
Member

This change is Reviewable

@yuzefovich
Copy link
Member

This can wait for 23.1.1.

@yuzefovich yuzefovich added the do-not-merge bors won't merge a PR with this label. label Mar 31, 2023
Copy link
Collaborator

@michae2 michae2 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:lgtm:

Reviewed 1 of 1 files at r1, 1 of 1 files at r2, 4 of 4 files at r3, all commit messages.
Reviewable status: :shipit: complete! 1 of 0 LGTMs obtained (waiting on @yuzefovich)

@yuzefovich yuzefovich removed the do-not-merge bors won't merge a PR with this label. label Apr 12, 2023
@yuzefovich yuzefovich merged commit 491e987 into release-23.1 Apr 12, 2023
@yuzefovich yuzefovich deleted the blathers/backport-release-23.1-99887 branch April 12, 2023 03:42
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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants