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.

Sign up for GitHub

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

Jump to bottom

*: track the memory usage of IndexJoin more accurate (#29068) #30091

Merged
merged 2 commits into from
Nov 29, 2021
Merged

*: track the memory usage of IndexJoin more accurate (#29068) #30091

merged 2 commits into from
Nov 29, 2021

Conversation

ti-srebot
Copy link
Contributor

@ti-srebot ti-srebot commented Nov 24, 2021 •
edited
Loading

cherry-pick #29068 to release-5.1
You can switch your code base to this Pull Request by using git-extras:

# In tidb repo:
git pr https://github.com/pingcap/tidb/pull/30091

After apply modifications, you can push your change to this PR via:

git push git@github.com:ti-srebot/tidb.git pr/30091:release-5.1-481455728ae5

What problem does this PR solve?

Issue Number: close #28650

Problem Summary:
The memory usage of indexJoinBuilderHelper.buildTemplateRange and indexRangesToKVWithoutSplit is not tracked. Thus we can not cancel the SQL which uses IndexJoin with huge nextColRanges even if it costs a lot of memory.

What is changed and how it works?

After this commit, the SQL can be cancelled when reaching the memory quota.

20211117-165851

Check List

Tests

  • Integration test
  • Manual test (add detailed scripts or steps below)

test.txt

Side effects

  • Performance regression: Consumes more CPU
    But this regression can be ignored since the newly added memory tracking is a low-frequency action.

Documentation
N/A

Release note

Track the memory usage of IndexJoin more accurate.

@XuHuaiyu @ti-srebot
cherry pick pingcap#29068 to release-5.1
696dd12 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-chi-bot
Copy link
Member

ti-chi-bot commented Nov 24, 2021 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • guo-shaoge
  • wshwsh12

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 do-not-merge/cherry-pick-not-approved do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels Nov 24, 2021
@ti-srebot
Copy link
Contributor Author

/run-all-tests

@ti-chi-bot ti-chi-bot added release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels Nov 24, 2021
@ti-srebot ti-srebot mentioned this pull request Nov 24, 2021
Merged
3 tasks
@ti-srebot ti-srebot added component/executor size/L Denotes a PR that changes 100-499 lines, ignoring generated files. type/5.1-cherry-pick type/enhancement The issue or PR belongs to an enhancement. labels Nov 24, 2021
@ti-chi-bot ti-chi-bot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Nov 24, 2021
@ti-srebot
Copy link
Contributor Author

@XuHuaiyu you're already a collaborator in bot's repo.

@ti-chi-bot ti-chi-bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Nov 26, 2021
@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Nov 26, 2021
@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 Nov 26, 2021
@zhouqiang-cl zhouqiang-cl added the cherry-pick-approved Cherry pick PR approved by release team. label Nov 29, 2021
@XuHuaiyu
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: fd30ee0

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Nov 29, 2021
@ti-chi-bot ti-chi-bot merged commit 199882d into pingcap:release-5.1 Nov 29, 2021
XuHuaiyu pushed a commit to XuHuaiyu/tidb that referenced this pull request Dec 16, 2021
@ti-srebot @XuHuaiyu
*: track the memory usage of IndexJoin more accurate (pingcap#29068) (p…
c12976a 
…ingcap#30091)
@XuHuaiyu XuHuaiyu mentioned this pull request Dec 16, 2021
Merged
zhouqiang-cl pushed a commit that referenced this pull request Dec 16, 2021
@XuHuaiyu @ti-srebot
*: track the memory usage of IndexJoin more accurate (#30785)
ade731a 
* *: track the memory usage of IndexJoin more accurate (#29068) (#30091)

* executor: send a task with error to the resultCh when panic happen (#30214) (#30240)

Co-authored-by: ti-srebot <66930949+ti-srebot@users.noreply.github.com>
@zhouqiang-cl zhouqiang-cl added this to the v5.1.4 milestone Feb 10, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@wshwsh12 wshwsh12 wshwsh12 approved these changes

@guo-shaoge guo-shaoge guo-shaoge approved these changes

Assignees

@XuHuaiyu XuHuaiyu

Labels
cherry-pick-approved Cherry pick PR approved by release team. component/executor release-note Denotes a PR that will be considered when it comes time to generate release notes. size/L Denotes a PR that changes 100-499 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. type/enhancement The issue or PR belongs to an enhancement. type/5.1-cherry-pick
Projects
None yet
Milestone
v5.1.4
Development

Successfully merging this pull request may close these issues.
6 participants
@ti-srebot @ti-chi-bot @XuHuaiyu @guo-shaoge @wshwsh12 @zhouqiang-cl