Skip to content

Conversation

ti-chi-bot
Copy link
Member

This is an automated cherry-pick of #55118

What problem does this PR solve?

Issue Number: close #55042

Problem Summary:

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.
      Just a mutex lock changes, using defer to protect it.

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 the issue that queries may get stuck when they are being killed due to exceeding tidb_mem_quota_query.

@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/XS Denotes a PR that changes 0-9 lines, ignoring generated files. type/cherry-pick-for-release-7.5 This PR is cherry-picked to release-7.5 from a source PR. labels Aug 26, 2024
Copy link

codecov bot commented Aug 26, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Please upload report for BASE (release-7.5@47279f5). Learn more about missing BASE report.

Additional details and impacted files
@@               Coverage Diff                @@
##             release-7.5     #55646   +/-   ##
================================================
  Coverage               ?   72.0058%           
================================================
  Files                  ?       1413           
  Lines                  ?     411775           
  Branches               ?          0           
================================================
  Hits                   ?     296502           
  Misses                 ?      95397           
  Partials               ?      19876           
Flag Coverage Δ
unit 72.0058% <100.0000%> (?)

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

Components Coverage Δ
dumpling 52.9400% <0.0000%> (?)
parser ∅ <0.0000%> (?)
br 53.5040% <0.0000%> (?)

Copy link
Contributor

@windtalker windtalker 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 approved needs-1-more-lgtm Indicates a PR needs 1 more LGTM. labels Aug 26, 2024
Copy link

ti-chi-bot bot commented Aug 26, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: guo-shaoge, windtalker

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:
  • OWNERS [guo-shaoge,windtalker]

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 lgtm and removed needs-1-more-lgtm Indicates a PR needs 1 more LGTM. labels Aug 26, 2024
Copy link

ti-chi-bot bot commented Aug 26, 2024

[LGTM Timeline notifier]

Timeline:

  • 2024-08-26 06:02:08.99683683 +0000 UTC m=+763724.131286945: ☑️ agreed by windtalker.
  • 2024-08-26 06:28:16.217353034 +0000 UTC m=+765291.351803155: ☑️ agreed by guo-shaoge.

@yibin87
Copy link
Contributor

yibin87 commented Aug 26, 2024

/retest

@ti-chi-bot ti-chi-bot bot merged commit 3c2d1af into pingcap:release-7.5 Aug 26, 2024
18 checks passed
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/XS Denotes a PR that changes 0-9 lines, ignoring generated files. type/cherry-pick-for-release-7.5 This PR is cherry-picked to release-7.5 from a source PR.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants