Skip to content

tiup: add offline update tiup #3540

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
Merged
merged 13 commits into from
Jun 8, 2020
Merged

tiup: add offline update tiup #3540

merged 13 commits into from
Jun 8, 2020

Conversation

@lichunzhu
Copy link
Contributor

@lichunzhu lichunzhu commented Jun 6, 2020

What is changed, added or deleted? (Required)

Update how to update offline tiup mirror.

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

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

@lichunzhu lichunzhu requested review from lonng, lucklove and yikeke June 6, 2020 05:55
yikeke
yikeke suggested changes Jun 7, 2020
View reviewed changes
Copy link
Contributor

@yikeke yikeke left a comment •
edited
Loading

Choose a reason for hiding this comment

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

不过感觉这个第 6 步不应该是离线部署 TiDB 集群的步骤？（在第 5 步已经部署结束了）而是维护/升级本地集群的方式？放这是不是有点 off topic 呢 @lonng @lichunzhu

@yikeke yikeke added needs-cherry-pick-4.0 translation/doing This PR’s assignee is translating this PR. labels Jun 7, 2020
@lichunzhu
Copy link
Contributor Author

lichunzhu commented Jun 7, 2020

不过感觉这个第 6 步不应该是离线部署 TiDB 集群的步骤？（在第 5 步已经部署结束了）而是维护/升级本地集群的方式？放这是不是有点 off topic 呢 @lonng @lichunzhu

是有点 off topic，是怎么行文比较好呢？

@yikeke
Copy link
Contributor

yikeke commented Jun 8, 2020

不过感觉这个第 6 步不应该是离线部署 TiDB 集群的步骤？（在第 5 步已经部署结束了）而是维护/升级本地集群的方式？放这是不是有点 off topic 呢 @lonng @lichunzhu

是有点 off topic，是怎么行文比较好呢？

这段的意思是，在使用 tiup 离线部署 tidb 的情况下，如果要升级本地集群，必须要先更新本地 tiup 镜像对吗？如果是这样的话，这一段放到升级文档里怎么样？

我觉得可以在升级文档的「升级兼容性说明」后面加上一段，让用户先判断自己的集群是离线部署还是在线部署的。如果是离线部署，就先阅读这个 PR 里的这段内容；如果是在线部署，就直接跳过这段内容往下读。

这样可以不？ @lichunzhu

@yikeke yikeke requested a review from kissmydb June 8, 2020 03:51
kissmydb
kissmydb suggested changes Jun 8, 2020
View reviewed changes
Copy link
Contributor

@kissmydb kissmydb left a comment

Choose a reason for hiding this comment

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

内容本身没有问题，但位置需要调整一下。这篇文档是离线部署，而内容是升级相关。建议新建一个和【upgrade-tidb-using-tiup】并列的离线升级的文档，把新增的内容挪过去。

yikeke
yikeke reviewed Jun 8, 2020
View reviewed changes
yikeke
yikeke reviewed Jun 8, 2020
View reviewed changes
yikeke
yikeke reviewed Jun 8, 2020
View reviewed changes
Copy link
Contributor

@yikeke yikeke left a comment

Choose a reason for hiding this comment

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

LGTM

@lichunzhu
Copy link
Contributor Author

lichunzhu commented Jun 8, 2020

我再加个刚刚看到的小bug

yikeke
yikeke reviewed Jun 8, 2020
View reviewed changes
@lichunzhu
Copy link
Contributor Author

lichunzhu commented Jun 8, 2020

我再加个刚刚看到的小bug

好了

kissmydb
kissmydb reviewed Jun 8, 2020
View reviewed changes
kissmydb
kissmydb reviewed Jun 8, 2020
View reviewed changes
TOC.md Outdated
+ 运维操作
+ 升级 TiDB 版本
+ [使用 TiUP（推荐）](/upgrade-tidb-using-tiup.md)
+ [使用 TiUP 离线镜像（推荐）](/upgrade-tidb-using-tiup-offline.md)
Copy link
Contributor

@kissmydb kissmydb Jun 8, 2020

Choose a reason for hiding this comment

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

Suggested change
+ [使用 TiUP 离线镜像（推荐）](/upgrade-tidb-using-tiup-offline.md)
+ [使用 TiUP 离线升级（推荐）](/upgrade-tidb-using-tiup-offline.md)

lichunzhu and others added 2 commits June 8, 2020 14:21
@lichunzhu
address comments
6b50ef1
@yikeke @kissmydb
Update TOC.md
537db93 
Co-authored-by: kissmydb <likun@pingcap.com>
kissmydb
kissmydb approved these changes Jun 8, 2020
View reviewed changes
Copy link
Contributor

@kissmydb kissmydb left a comment

Choose a reason for hiding this comment

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

LGTM

@yikeke
Copy link
Contributor

yikeke commented Jun 8, 2020

/merge

@sre-bot sre-bot added the status/can-merge Indicates a PR has been approved by a committer. label Jun 8, 2020
@sre-bot
Copy link
Contributor

sre-bot commented Jun 8, 2020

/run-all-tests

@lichunzhu lichunzhu mentioned this pull request Jun 8, 2020
Closed
@sre-bot sre-bot merged commit 32349a6 into pingcap:master Jun 8, 2020
sre-bot pushed a commit to sre-bot/docs-cn that referenced this pull request Jun 8, 2020
@lichunzhu @sre-bot
cherry pick pingcap#3540 to release-4.0
5c7238d 
Signed-off-by: sre-bot <sre-bot@pingcap.com>
@sre-bot sre-bot mentioned this pull request Jun 8, 2020
Merged
5 tasks
@sre-bot
Copy link
Contributor

sre-bot commented Jun 8, 2020

cherry pick to release-4.0 in PR #3557

@lichunzhu lichunzhu deleted the addTiUPOfflineUpdate branch June 8, 2020 06:29
yikeke pushed a commit that referenced this pull request Jun 8, 2020
@sre-bot @lichunzhu
cherry pick #3540 to release-4.0 (#3557)
c7667e0 
Signed-off-by: sre-bot <sre-bot@pingcap.com>

Co-authored-by: Chunzhu Li <lichunzhu@stu.xjtu.edu.cn>
@ran-huang ran-huang mentioned this pull request Jun 8, 2020
Merged
5 tasks
@yikeke yikeke self-assigned this Jun 8, 2020
@sre-bot sre-bot mentioned this pull request Jun 8, 2020
Merged
5 tasks
@yikeke yikeke removed their assignment Jun 10, 2020
@ran-huang ran-huang changed the title tiup/: add offline update tiup tiup: add offline update tiup Jun 10, 2020
@ran-huang ran-huang mentioned this pull request Jun 10, 2020
Merged
5 tasks
@sre-bot sre-bot mentioned this pull request Jun 11, 2020
Merged
5 tasks
@ran-huang ran-huang 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 19, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@lucklove lucklove Awaiting requested review from lucklove

3 more reviewers

@yikeke yikeke yikeke approved these changes

@lonng lonng lonng approved these changes

@kissmydb kissmydb kissmydb approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@ran-huang ran-huang

Labels

status/can-merge Indicates a PR has been approved by a committer. translation/done This PR has been translated from English into Chinese and updated to pingcap/docs-cn in a PR.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@lichunzhu @yikeke @sre-bot @lonng @kissmydb @ran-huang