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

sql-infra: add resource control feature #12353

Merged
merged 68 commits into from
Feb 17, 2023
Merged

sql-infra: add resource control feature #12353

merged 68 commits into from
Feb 17, 2023

Conversation

hfxsd
Copy link
Collaborator

@hfxsd hfxsd commented Feb 1, 2023

What is changed, added or deleted? (Required)

Added docs about resource control.

Which TiDB version(s) do your changes apply to? (Required)

Tips for choosing the affected version(s):

By default, CHOOSE MASTER ONLY so your changes will be applied to the next TiDB major or minor releases. If your PR involves a product feature behavior change or a compatibility change, CHOOSE THE AFFECTED RELEASE BRANCH(ES) AND MASTER.

For details, see tips for choosing the affected versions.

  • master (the latest development version)
  • v6.6 (TiDB 6.6 versions)
  • v6.5 (TiDB 6.5 versions)
  • v6.4 (TiDB 6.4 versions)
  • v6.1 (TiDB 6.1 versions)
  • v5.4 (TiDB 5.4 versions)
  • v5.3 (TiDB 5.3 versions)
  • v5.2 (TiDB 5.2 versions)
  • v5.1 (TiDB 5.1 versions)
  • v5.0 (TiDB 5.0 versions)

What is the related PR or file link(s)?

Do your changes match any of the following descriptions?

  • Delete files
  • Change aliases
  • Need modification after applied to another branch
  • Might cause conflicts after applied to another branch

@hfxsd hfxsd self-assigned this Feb 1, 2023
@ti-chi-bot
Copy link
Member

ti-chi-bot commented Feb 1, 2023 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • dveeden
  • qiancai

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.

@hfxsd hfxsd marked this pull request as draft February 1, 2023 07:31
@ti-chi-bot ti-chi-bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Feb 1, 2023
@ti-chi-bot ti-chi-bot added missing-translation-status This PR does not have translation status info. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Feb 1, 2023
@hfxsd hfxsd added translation/from-docs-cn This PR is translated from a PR in pingcap/docs-cn. area/sql-infra Indicates that the Issue or PR belongs to the area of sql-infra and sql-metadata. type/compatibility-or-feature-change This PR involves compatibility changes or feature behavior changes. v6.6 and removed missing-translation-status This PR does not have translation status info. labels Feb 1, 2023
@ran-huang ran-huang removed their request for review February 1, 2023 08:17
@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 Feb 1, 2023
@ti-chi-bot ti-chi-bot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Feb 1, 2023
@hfxsd hfxsd changed the title *: add resource control feature sql-infra: add resource control feature Feb 2, 2023
@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 Feb 16, 2023
@hfxsd @qiancai
Apply suggestions from code review
5e1fd62 
Co-authored-by: Grace Cai <qqzczy@126.com>
hfxsd
hfxsd commented Feb 17, 2023
View reviewed changes
tidb-resource-control.md Outdated Show resolved Hide resolved
hfxsd
hfxsd commented Feb 17, 2023
View reviewed changes
tidb-resource-control.md Outdated Show resolved Hide resolved
@hfxsd
Copy link
Collaborator Author

hfxsd commented Feb 17, 2023

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 3ddf4a9

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Feb 17, 2023
@ti-chi-bot ti-chi-bot removed the status/can-merge Indicates a PR has been approved by a committer. label Feb 17, 2023
qiancai
qiancai approved these changes Feb 17, 2023
View reviewed changes
Copy link
Collaborator

@qiancai qiancai left a comment

Choose a reason for hiding this comment

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

LGTM

@hfxsd
Copy link
Collaborator Author

hfxsd commented Feb 17, 2023

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 0d85e11

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Feb 17, 2023
@hfxsd
Copy link
Collaborator Author

hfxsd commented Feb 17, 2023

/verify

@hfxsd
Copy link
Collaborator Author

hfxsd commented Feb 17, 2023

/merge

@TomShawn TomShawn closed this Feb 17, 2023
@TomShawn TomShawn reopened this Feb 17, 2023
@ti-chi-bot ti-chi-bot merged commit a1feac5 into pingcap:master Feb 17, 2023
@ti-chi-bot ti-chi-bot mentioned this pull request Feb 17, 2023
Merged
14 tasks
@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created to branch release-6.6: #12563.

ti-chi-bot added a commit that referenced this pull request Feb 17, 2023
@ti-chi-bot
sql-infra: add resource control feature (#12353) (#12563)
8b88dbe
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tiancaiamao tiancaiamao tiancaiamao left review comments

@glorv glorv glorv left review comments

@nolouch nolouch nolouch left review comments

@dveeden dveeden dveeden approved these changes

@songrijie songrijie songrijie approved these changes

@qiancai qiancai qiancai approved these changes

@BornChanger BornChanger BornChanger approved these changes

@Connor1996 Connor1996 Awaiting requested review from Connor1996

@JmPotato JmPotato Awaiting requested review from JmPotato

@easonn7 easonn7 Awaiting requested review from easonn7

Assignees

@hfxsd hfxsd

Labels
area/sql-infra Indicates that the Issue or PR belongs to the area of sql-infra and sql-metadata. size/XXL Denotes a PR that changes 1000+ 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. translation/from-docs-cn This PR is translated from a PR in pingcap/docs-cn. type/compatibility-or-feature-change This PR involves compatibility changes or feature behavior changes. v6.6
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.