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: inherit memory quota from user session for admin check (#49260) #49262

Merged

Conversation

ti-chi-bot
Copy link
Member

This is an automated cherry-pick of #49260

What problem does this PR solve?

Issue Number: close #49258

Problem Summary:

ADMIN CHECK is implemented with running queries with internal sessions. tidb_mem_quota_query is not initialized for internal session.

What changed and how does it work?

Inherit ADMIN CHECK session variable tidb_mem_quota_query for internal session.

Check List

Tests

  • Unit test
  • Integration test
  • Manual test (add detailed scripts or steps below)
    mysql> admin check index sbtest1 idx;
    ERROR 8175 (HY000): Your query has been cancelled due to exceeding the allowed memory limit for a single SQL query. Please try narrowing your query scope or increase the tidb_mem_quota_query limit and try again.[conn=0]
    mysql> set session tidb_mem_quota_query = -1;
    Query OK, 0 rows affected (0.00 sec)
    
    mysql> admin check index sbtest1 idx;
    Query OK, 0 rows affected (1 min 23.84 sec)
    
  • 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.

None

@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. type/cherry-pick-for-release-7.5 This PR is cherry-picked to release-7.5 from a source PR. labels Dec 7, 2023
@ti-chi-bot ti-chi-bot bot added approved needs-1-more-lgtm Indicates a PR needs 1 more LGTM. labels Dec 7, 2023
@tangenta
Copy link
Contributor

tangenta commented Dec 7, 2023

/retest

@ti-chi-bot ti-chi-bot added the cherry-pick-approved Cherry pick PR approved by release team. label Dec 7, 2023
Copy link

codecov bot commented Dec 7, 2023

Codecov Report

❗ No coverage uploaded for pull request base (release-7.5@6b8d834). Click here to learn what that means.
The diff coverage is n/a.

Additional details and impacted files
@@               Coverage Diff                @@
##             release-7.5     #49262   +/-   ##
================================================
  Coverage               ?   71.9707%           
================================================
  Files                  ?       1400           
  Lines                  ?     406383           
  Branches               ?          0           
================================================
  Hits                   ?     292477           
  Misses                 ?      94221           
  Partials               ?      19685           
Flag Coverage Δ
unit 71.9707% <0.0000%> (?)

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

Components Coverage Δ
dumpling 53.9913% <0.0000%> (?)
parser ∅ <0.0000%> (?)
br 53.2473% <0.0000%> (?)

Copy link

ti-chi-bot bot commented Dec 8, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: wjhuang2016, zimulala

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 [wjhuang2016,zimulala]

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 Dec 8, 2023
Copy link

ti-chi-bot bot commented Dec 8, 2023

[LGTM Timeline notifier]

Timeline:

  • 2023-12-07 12:30:54.148823224 +0000 UTC m=+1703482.814049421: ☑️ agreed by wjhuang2016.
  • 2023-12-08 01:28:42.480418085 +0000 UTC m=+1750151.145644280: ☑️ agreed by zimulala.

@ti-chi-bot ti-chi-bot bot merged commit 13a9c37 into pingcap:release-7.5 Dec 8, 2023
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-none Denotes a PR that doesn't merit a release note. size/S Denotes a PR that changes 10-29 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