Skip to content

Update content about upgrade#6474

Merged
ti-chi-bot merged 11 commits into
pingcap:masterfrom
lilyjazz:patch-1
Jun 21, 2021
Merged

Update content about upgrade#6474
ti-chi-bot merged 11 commits into
pingcap:masterfrom
lilyjazz:patch-1

Conversation

@lilyjazz
Copy link
Copy Markdown
Member

@lilyjazz lilyjazz commented Jun 19, 2021

First-time contributors' checklist

What is changed, added or deleted? (Required)

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

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

@ti-chi-bot ti-chi-bot requested a review from TomShawn June 19, 2021 03:03
@ti-chi-bot ti-chi-bot added missing-translation-status This PR does not have translation status info. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Jun 19, 2021
@lilyjazz
Copy link
Copy Markdown
Member Author

lilyjazz commented Jun 19, 2021

tech review @lucklove

qiancai
qiancai reviewed Jun 19, 2021
View reviewed changes
Comment thread upgrade-tidb-using-tiup.md Outdated
Comment thread upgrade-tidb-using-tiup.md Outdated
Comment thread upgrade-tidb-using-tiup.md Outdated
- 使用 TiDB Ansible 管理的 4.0 版本集群，需要先按照 [4.0 版本文档的说明](https://docs.pingcap.com/zh/tidb/v4.0/upgrade-tidb-using-tiup)将集群导入到 TiUP (`tiup cluster`) 管理后，再按本文档说明升级到 5.0 版本。
- TiDB 目前暂时不支持版本降级或升级后回退，这类功能将在未来支持。
- 使用 TiDB Ansible 管理的 4.0 版本集群，需要先按照 [4.0 版本文档的说明](https://docs.pingcap.com/zh/tidb/v4.0/upgrade-tidb-using-tiup)将集群导入到 TiUP (`tiup cluster`) 管理后，再按本文档说明升级到 5.0 版本及后续修订版本。
- 若要将 3.0 之前的版本升级至 5.0 版本：
Copy link
Copy Markdown
Collaborator

@qiancai qiancai Jun 19, 2021

Choose a reason for hiding this comment

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

如果此文档里有哪些可以从 5.0. 替换为 5.1 的地方，麻烦请替换下吧。因为 v5.1 文档在官网有一个独立的入口，此文档是专门给 v5.1 用的。

Copy link
Copy Markdown
Member Author

@lilyjazz lilyjazz Jun 19, 2021

Choose a reason for hiding this comment

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

修改完了，可以帮忙 check 下～
具体的技术检查还是需要帅总 @lucklove

Comment thread upgrade-tidb-using-tiup.md Outdated
lilyjazz and others added 3 commits June 19, 2021 20:13
@lilyjazz @qiancai
Update upgrade-tidb-using-tiup.md
11bf403 
Co-authored-by: Grace Cai <qqzczy@126.com>
@lilyjazz @qiancai
Update upgrade-tidb-using-tiup.md
1a283d4 
Co-authored-by: Grace Cai <qqzczy@126.com>
@lilyjazz @qiancai
Update upgrade-tidb-using-tiup.md
029a4d2 
Co-authored-by: Grace Cai <qqzczy@126.com>
lilyjazz
lilyjazz commented Jun 19, 2021
View reviewed changes
Comment thread upgrade-tidb-using-tiup.md Outdated
@ti-chi-bot ti-chi-bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Jun 19, 2021
@TomShawn TomShawn added v5.1 This PR/issue applies to TiDB v5.1. translation/doing This PR’s assignee is translating this PR. labels Jun 21, 2021
@ti-chi-bot ti-chi-bot removed the missing-translation-status This PR does not have translation status info. label Jun 21, 2021
@qiancai qiancai requested a review from lucklove June 21, 2021 02:29
qiancai
qiancai reviewed Jun 21, 2021
View reviewed changes
Comment thread upgrade-tidb-using-tiup.md Outdated
@lucklove
Copy link
Copy Markdown
Member

lucklove commented Jun 21, 2021

LGTM

@lilyjazz @qiancai
Update upgrade-tidb-using-tiup.md
45f8680 
Co-authored-by: Grace Cai <qqzczy@126.com>
TomShawn
TomShawn reviewed Jun 21, 2021
View reviewed changes
Comment thread upgrade-tidb-using-tiup.md Outdated
TomShawn
TomShawn reviewed Jun 21, 2021
View reviewed changes
Comment thread upgrade-tidb-using-tiup.md Outdated
- 不支持在升级后回退至 4.0 或更旧版本。
- 使用 TiDB Ansible 管理的 4.0 版本集群，需要先按照 [4.0 版本文档的说明](https://docs.pingcap.com/zh/tidb/v4.0/upgrade-tidb-using-tiup)将集群导入到 TiUP (`tiup cluster`) 管理后，再按本文档说明升级到 5.0 版本。
- 若要将 3.0 之前的版本升级至 5.0 版本：
- TiDB 目前暂不支持版本降级或升级后回退，此类功能将在未来支持。
Copy link
Copy Markdown
Contributor

@TomShawn TomShawn Jun 21, 2021

Choose a reason for hiding this comment

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

不建议对未来版本的支持作承诺。

Copy link
Copy Markdown
Member Author

@lilyjazz lilyjazz Jun 21, 2021

Choose a reason for hiding this comment

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

好的～

lilyjazz
lilyjazz commented Jun 21, 2021
View reviewed changes
Comment thread upgrade-tidb-using-tiup.md Outdated
TomShawn and others added 2 commits June 21, 2021 17:38
TomShawn
TomShawn approved these changes Jun 21, 2021
View reviewed changes
Copy link
Copy Markdown
Contributor

@TomShawn TomShawn left a comment

Choose a reason for hiding this comment

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

Rest LGTM

Comment thread upgrade-tidb-using-tiup.md Outdated
@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Jun 21, 2021
TomShawn
TomShawn reviewed Jun 21, 2021
View reviewed changes
Comment thread upgrade-tidb-using-tiup.md
TomShawn
TomShawn reviewed Jun 21, 2021
View reviewed changes
Comment thread upgrade-tidb-using-tiup.md Outdated
@TomShawn TomShawn requested a review from qiancai June 21, 2021 09:44
@TomShawn TomShawn assigned TomShawn and unassigned qiancai Jun 21, 2021
TomShawn
TomShawn reviewed Jun 21, 2021
View reviewed changes
Comment thread upgrade-tidb-using-tiup.md Outdated
@ti-chi-bot
Copy link
Copy Markdown
Member

ti-chi-bot commented Jun 21, 2021

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • TomShawn
  • 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.

Details

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 status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Jun 21, 2021
@qiancai
Copy link
Copy Markdown
Collaborator

qiancai commented Jun 21, 2021

/merge

@ti-chi-bot
Copy link
Copy Markdown
Member

ti-chi-bot commented Jun 21, 2021

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

DetailsCommit hash: 962624f

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Jun 21, 2021
@ti-chi-bot ti-chi-bot merged commit 7da3baf into pingcap:master Jun 21, 2021
@TomShawn TomShawn mentioned this pull request Jun 22, 2021
Merged
11 tasks
@TomShawn TomShawn added translation/done This PR has been translated from English into Chinese and updated to pingcap/docs-cn in a PR. and removed translation/doing This PR’s assignee is translating this PR. labels Jun 22, 2021
@ti-chi-bot ti-chi-bot mentioned this pull request Jun 24, 2021
Merged
11 tasks
3AceShowHand pushed a commit to 3AceShowHand/docs-cn that referenced this pull request Jul 27, 2021
@lilyjazz @3AceShowHand
Update content about upgrade (pingcap#6474)
30c39cc
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@qiancai qiancai qiancai approved these changes

@lucklove lucklove Awaiting requested review from lucklove

+1 more reviewer

@TomShawn TomShawn TomShawn approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@TomShawn TomShawn

Labels

size/M Denotes a PR that changes 30-99 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/done This PR has been translated from English into Chinese and updated to pingcap/docs-cn in a PR. v5.1 This PR/issue applies to TiDB v5.1.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@lilyjazz @lucklove @ti-chi-bot @qiancai @TomShawn