[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
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

executor: fix hang in hash agg when exceeding memory limit leads to panic (#57641) #57696

Merged

Conversation

ti-chi-bot
Copy link
Member

This is an automated cherry-pick of #57641

What problem does this PR solve?

Issue Number: close #57546

Problem Summary:

Partial worker gets input by calling getChildInput function. In this function, we call Consume function to track memory occupied by input chunk. When sql's memory usage is high, there will be possible to lead to panic in Consume function. According to the synchronization rule, each time we get a chunk from getChildInput we need to call Done function for variable inflightChunkSync. However, when panic happens Done function is not called and the counter in inflightChunkSync will never be minused to 0 which leads to hang.

Solution: Each time waked up in channel in getChildInput function, we will set a variable named needDone. When panic happens in getChildInput function, we will catch the panic in this function and check if variable needDone is set to true then decide if we need to call Done function for inflightChunkSync, and rethrow the panic at last.

What changed and how does it work?

Check List

Tests

  • Unit test
  • Integration test
  • Manual test (add detailed scripts or steps below)
  • No need to test
    • I checked and no code files have been changed.

Side effects

  • Performance regression: Consumes more CPU
  • Performance regression: Consumes more Memory
  • Breaking backward compatibility

Documentation

  • Affects user behaviors
  • Contains syntax changes
  • Contains variable changes
  • Contains experimental features
  • Changes MySQL compatibility

Release note

Please refer to Release Notes Language Style Guide to write a quality release note.

fix issue that tidb may hang in hash agg when exceeding memory limit leads to panic

@ti-chi-bot ti-chi-bot added release-note Denotes a PR that will be considered when it comes time to generate release notes. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. type/cherry-pick-for-release-8.5 This PR is cherry-picked to release-8.5 from a source PR. labels Nov 26, 2024
Copy link
codecov bot commented Nov 26, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Please upload report for BASE (release-8.5@6e860ce). Learn more about missing BASE report.

Additional details and impacted files
@@               Coverage Diff                @@
##             release-8.5     #57696   +/-   ##
================================================
  Coverage               ?   56.8661%           
================================================
  Files                  ?       1770           
  Lines                  ?     626484           
  Branches               ?          0           
================================================
  Hits                   ?     356257           
  Misses                 ?     246123           
  Partials               ?      24104           
Flag Coverage Δ
integration 36.8333% <94.1176%> (?)
unit 72.5085% <100.0000%> (?)

Flags with carried forward coverage won't be shown. Click here to find out more.

Components Coverage Δ
dumpling 52.9478% <0.0000%> (?)
parser ∅ <0.0000%> (?)
br 52.3130% <0.0000%> (?)

Copy link
Contributor
@xzhangxian1008 xzhangxian1008 left a comment

Choose a reason for hiding this comment

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

LGTM

@ti-chi-bot ti-chi-bot bot added the needs-1-more-lgtm Indicates a PR needs 1 more LGTM. label Nov 26, 2024
@xzhangxian1008
Copy link
Contributor

/retest

Copy link
ti-chi-bot bot commented Nov 26, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: XuHuaiyu, xzhangxian1008

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

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@ti-chi-bot ti-chi-bot bot added approved lgtm and removed needs-1-more-lgtm Indicates a PR needs 1 more LGTM. labels Nov 26, 2024
Copy link
ti-chi-bot bot commented Nov 26, 2024

[LGTM Timeline notifier]

Timeline:

  • 2024-11-26 03:43:23.201062564 +0000 UTC m=+521590.820717073: ☑️ agreed by xzhangxian1008.
  • 2024-11-26 03:55:52.499820852 +0000 UTC m=+522340.119475368: ☑️ agreed by XuHuaiyu.

@ti-chi-bot ti-chi-bot bot added cherry-pick-approved Cherry pick PR approved by release team. and removed do-not-merge/cherry-pick-not-approved labels Nov 26, 2024
@ti-chi-bot ti-chi-bot bot merged commit 175ce54 into pingcap:release-8.5 Nov 26, 2024
18 checks passed
@xzhangxian1008 xzhangxian1008 deleted the cherry-pick-57641-to-release-8.5 branch November 26, 2024 05:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved cherry-pick-approved Cherry pick PR approved by release team. lgtm release-note Denotes a PR that will be considered when it comes time to generate release notes. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. type/cherry-pick-for-release-8.5 This PR is cherry-picked to release-8.5 from a source PR.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants