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

topsql: fix memory leak in stmtstats #34558

Merged
merged 4 commits into from
May 11, 2022
Merged

Conversation

mornyx
Copy link
Contributor

@mornyx mornyx commented May 11, 2022

Signed-off-by: mornyx [email protected]

What problem does this PR solve?

Issue Number: ref #34525, #34502

In #33861, we also call the stmtstats framework to record the execution of statements when TopSQL is not enabled, but the aggregator inside stmtstats will take data only when TopSQL is enabled. So the memory leak happens.

In this PR, the behavior becomes: even if TopSQL is not enabled, the aggregator in stmtstats will take the data, but just discard it, not send it to the reporter.

Release note

None

@ti-chi-bot
Copy link
Member

ti-chi-bot commented May 11, 2022

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • crazycs520
  • zhongzc

To complete the pull request process, please ask the reviewers in the list to review by filling /cc @reviewer in the comment.
After your PR has acquired the required number of LGTMs, you can assign this pull request to the committer in the list by filling /assign @committer in the comment to help you merge this pull request.

The full list of commands accepted by this bot can be found here.

Reviewer can indicate their review by submitting an approval review.
Reviewer can cancel approval by submitting a request changes review.

@ti-chi-bot ti-chi-bot added release-note-none Denotes a PR that doesn't merit a release note. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels May 11, 2022
@mornyx
Copy link
Contributor Author

mornyx commented May 11, 2022

/cc @zhongzc @crazycs520 PTAL, thanks!

@breezewish
Copy link
Member

How about tests to avoid regression?

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label May 11, 2022
Signed-off-by: mornyx <[email protected]>
@ti-chi-bot ti-chi-bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels May 11, 2022
@mornyx
Copy link
Contributor Author

mornyx commented May 11, 2022

How about tests to avoid regression?

It was my fault in code review, I updated the unit tests but only covered this PR scenario. It is difficult to expose all possible memory leaks through unit or integration tests, which require long runs..

But I think mistakes like "missing some changes" can be avoided with more careful reviews, rather than being exposed until the QA stage.

@sre-bot
Copy link
Contributor

sre-bot commented May 11, 2022

@ti-chi-bot ti-chi-bot added status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels May 11, 2022
@mornyx
Copy link
Contributor Author

mornyx commented May 11, 2022

/assign @crazycs520

Please merge, thanks

@crazycs520
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member

This pull request has been accepted and is ready to merge.

Commit hash: be524ec

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label May 11, 2022
@ti-chi-bot ti-chi-bot merged commit 9e7c951 into pingcap:master May 11, 2022
@sre-bot
Copy link
Contributor

sre-bot commented May 11, 2022

TiDB MergeCI notify

CI Name Result Duration Compare with Parent commit
idc-jenkins-ci/integration-cdc-test 🟢 all 34 tests passed 27 min Existing passed
idc-jenkins-ci-tidb/integration-common-test 🟢 all 11 tests passed 11 min Existing passed
idc-jenkins-ci-tidb/tics-test 🟢 all 1 tests passed 8 min 43 sec Existing passed
idc-jenkins-ci-tidb/common-test 🟢 all 12 tests passed 7 min 7 sec Existing passed
idc-jenkins-ci-tidb/integration-ddl-test 🟢 all 6 tests passed 6 min 34 sec Existing passed
idc-jenkins-ci-tidb/sqllogic-test-1 🟢 all 26 tests passed 6 min 17 sec Existing passed
idc-jenkins-ci-tidb/sqllogic-test-2 🟢 all 28 tests passed 5 min 58 sec Existing passed
idc-jenkins-ci-tidb/mybatis-test 🟢 all 1 tests passed 3 min 34 sec Existing passed
idc-jenkins-ci-tidb/integration-compatibility-test 🟢 all 1 tests passed 3 min 17 sec Existing passed
idc-jenkins-ci-tidb/plugin-test 🟢 build success, plugin test success 4min Existing passed

@mornyx mornyx deleted the issue-34525 branch May 25, 2022 04:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
release-note-none Denotes a PR that doesn't merit a release note. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants