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

Update TiKV store status information (#6949) #8000

Merged

Conversation

ti-chi-bot
Copy link
Member

This is an automated cherry-pick of #6949

What is changed, added or deleted? (Required)

Added the relationship between a TiKV store in "faq/deploy-and-maintain-faq.md", "pd-control.md", and "tidb-scheduling.md".

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

Although most of Chinese PRs are only applied to master, newly updated PR #8723 updated the contents from v4.0 to master, for consistency, this PR will be also applied to the corresponding versions.

  • master (the latest development version)
  • 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)
  • v4.0 (TiDB 4.0 versions)
  • v3.1 (TiDB 3.1 versions)
  • v3.0 (TiDB 3.0 versions)
  • v2.1 (TiDB 2.1 versions)

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

  • This PR is translated from:
  1. For the "faq/deploy-and-maintain-faq.md", it is translated from Docs: revise the status information of a TiKV store docs-cn#7338.
  2. For the "pd-control.md", it is translated from docs: update TiKV store status information docs-cn#7177.
  3. For the "tidb-scheduling.md", it is translated from Docs: revise the status information of a TiKV store docs-cn#7338 and docs: update the TiKV store status description docs-cn#8723.
  4. For the newly added image, it is translated from docs: update TiKV store status information docs-cn#7177.
  • Other reference 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

en-jin19 and others added 12 commits March 31, 2022 12:28
Co-authored-by: TomShawn <41534398+TomShawn@users.noreply.github.com>
Co-authored-by: shichun-0415 <89768198+shichun-0415@users.noreply.github.com>
Co-authored-by: shichun-0415 <89768198+shichun-0415@users.noreply.github.com>
Co-authored-by: shichun-0415 <89768198+shichun-0415@users.noreply.github.com>
@ti-chi-bot
Copy link
Member Author

ti-chi-bot commented Mar 31, 2022

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • en-jin19

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 area/scheduling Indicates that the Issue or PR belongs to the area of scheduling. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. type/cherry-pick-for-release-5.1 This PR is cherry-picked to release-5.1 from a source PR. type/enhancement The issue or PR belongs to an enhancement. labels Mar 31, 2022
@ti-chi-bot ti-chi-bot requested a review from TomShawn March 31, 2022 12:28
@en-jin19 en-jin19 requested review from en-jin19 and removed request for TomShawn March 31, 2022 12:46
tidb-scheduling.md Outdated Show resolved Hide resolved
Copy link
Contributor

@en-jin19 en-jin19 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 added the status/LGT1 Indicates that a PR has LGTM 1. label Mar 31, 2022
@en-jin19
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member Author

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

Commit hash: b35f3bd

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Mar 31, 2022
@ti-chi-bot ti-chi-bot merged commit 58bf07a into pingcap:release-5.1 Mar 31, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/scheduling Indicates that the Issue or PR belongs to the area of scheduling. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. status/can-merge Indicates a PR has been approved by a committer. status/LGT1 Indicates that a PR has LGTM 1. type/cherry-pick-for-release-5.1 This PR is cherry-picked to release-5.1 from a source PR. type/enhancement The issue or PR belongs to an enhancement.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants