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

Tiup 5.0: update deploy, upgrade, maintain docs #5099

Merged
merged 6 commits into from
Mar 29, 2021
Merged

Tiup 5.0: update deploy, upgrade, maintain docs #5099

merged 6 commits into from
Mar 29, 2021

Conversation

TomShawn
Copy link
Contributor

@TomShawn TomShawn commented Mar 25, 2021 •
edited
Loading

What is changed, added or deleted? (Required)

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

  • master (the latest development version)
  • 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)?

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

@ti-chi-bot ti-chi-bot added missing-translation-status This PR does not have translation status info. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Mar 25, 2021
@TomShawn
Copy link
Contributor Author

/label needs-cherry-pick-5.0
/label v5.0
/status PTAL
/translation from-docs-cn
/cc @yikeke @King-Dylan @lucklove

@ti-chi-bot ti-chi-bot added status/PTAL This PR is ready for reviewing. translation/from-docs-cn This PR is translated from a PR in pingcap/docs-cn. needs-cherry-pick-5.0 v5.0 This PR/issue applies to TiDB v5.0. and removed missing-translation-status This PR does not have translation status info. labels Mar 25, 2021
@TomShawn
Copy link
Contributor Author

/label requires-version-specific-changes

@ti-chi-bot ti-chi-bot added the requires-version-specific-changes After cherry-picked, the cherry-picked PR requires further changes. label Mar 25, 2021
@yikeke yikeke requested a review from ran-huang March 25, 2021 05:54
ran-huang
ran-huang reviewed Mar 25, 2021
View reviewed changes
Copy link
Contributor

@ran-huang ran-huang left a comment

Choose a reason for hiding this comment

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

Reviewed post-installation-check.md and above.

TOC.md Outdated Show resolved Hide resolved
TOC.md Outdated Show resolved Hide resolved
benchmark/benchmark-tidb-using-sysbench.md Outdated Show resolved Hide resolved
benchmark/benchmark-tidb-using-sysbench.md Outdated Show resolved Hide resolved
ran-huang
ran-huang reviewed Mar 25, 2021
View reviewed changes
production-deployment-using-tiup.md Outdated Show resolved Hide resolved
production-deployment-using-tiup.md Outdated
- host: 10.0.1.4
```

The following examples cover six common scenarios. You need to modify the configuration file (named `topology.yaml`) according to the topology description and templates in the corresponding links. For other scenarios, edit the configuration template accordingly.

The following topology documents provide a cluster configuration template for each of the following common scenarios:
Copy link
Contributor

Choose a reason for hiding this comment

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

This paragraph repeats the previous one.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Deleted

upgrade-tidb-using-tiup.md Outdated Show resolved Hide resolved
upgrade-tidb-using-tiup.md Outdated Show resolved Hide resolved
upgrade-tidb-using-tiup.md Outdated Show resolved Hide resolved
upgrade-tidb-using-tiup.md Outdated Show resolved Hide resolved
@TomShawn @ran-huang
Apply suggestions from code review
b35c83d 
Co-authored-by: Ran <huangran@pingcap.com>
lucklove
lucklove reviewed Mar 29, 2021
View reviewed changes
Copy link
Member

@lucklove lucklove left a comment

Choose a reason for hiding this comment

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

/lgtm

benchmark/benchmark-tidb-using-sysbench.md Outdated Show resolved Hide resolved
@TomShawn @ran-huang
Update benchmark/benchmark-tidb-using-sysbench.md
b5fc36d 
Co-authored-by: Ran <huangran@pingcap.com>
TomShawn
TomShawn commented Mar 29, 2021
View reviewed changes
upgrade-tidb-using-tiup.md Outdated Show resolved Hide resolved
@ti-chi-bot ti-chi-bot added the requires-followup This PR requires a follow-up task after being merged. label Mar 29, 2021
@TomShawn
Copy link
Contributor Author

TomShawn commented Mar 29, 2021 •
edited
Loading

Follow-up: #5099 (comment)
--> pingcap/docs-cn#5885

@ran-huang
Copy link
Contributor

/lgtm

@ti-chi-bot
Copy link
Member

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • ran-huang

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 writing /lgtm in a comment.
Reviewer can cancel approval by writing /lgtm cancel in a comment.

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Mar 29, 2021
@yikeke
Copy link
Contributor

yikeke commented Mar 29, 2021

Ready for merge? @TomShawn

@TomShawn
Copy link
Contributor Author

Ready for merge? @TomShawn

I think so.

@TomShawn
Copy link
Contributor Author

/label require-LGT1

@ti-chi-bot ti-chi-bot added the require-LGT1 Indicates that the PR requires an LGTM. label Mar 29, 2021
@TomShawn
Copy link
Contributor Author

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: c9cd8ee

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Mar 29, 2021
@ti-chi-bot ti-chi-bot merged commit 52b0926 into pingcap:master Mar 29, 2021
ti-srebot pushed a commit to ti-srebot/docs that referenced this pull request Mar 29, 2021
@TomShawn @ti-srebot
cherry pick pingcap#5099 to release-5.0
3ef494f 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot ti-srebot mentioned this pull request Mar 29, 2021
Merged
10 tasks
@ti-srebot
Copy link
Contributor

cherry pick to release-5.0 in PR #5155

@TomShawn TomShawn deleted the tiup-for-5.0 branch March 29, 2021 11:26
ti-chi-bot pushed a commit that referenced this pull request Mar 29, 2021
@ti-srebot
Tiup 5.0: update deploy, upgrade, maintain docs (#5099) (#5155)
cc77743
@TomShawn TomShawn mentioned this pull request Mar 30, 2021
Merged
10 tasks
@TomShawn
Copy link
Contributor Author

/remove-label requires-followup

@ti-chi-bot ti-chi-bot removed the requires-followup This PR requires a follow-up task after being merged. label Mar 30, 2021
@ti-srebot ti-srebot mentioned this pull request Apr 2, 2021
Merged
10 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ran-huang ran-huang ran-huang left review comments

@lucklove lucklove lucklove left review comments

@King-Dylan King-Dylan Awaiting requested review from King-Dylan

@yikeke yikeke Awaiting requested review from yikeke

Assignees
No one assigned
Labels
require-LGT1 Indicates that the PR requires an LGTM. requires-version-specific-changes After cherry-picked, the cherry-picked PR requires further changes. 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/LGT1 Indicates that a PR has LGTM 1. status/PTAL This PR is ready for reviewing. translation/from-docs-cn This PR is translated from a PR in pingcap/docs-cn. v5.0 This PR/issue applies to TiDB v5.0.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@TomShawn @ran-huang @ti-chi-bot @yikeke @ti-srebot @lucklove