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

zh: refine TLS docs; add a FAQ about task upgrade #442

Merged
merged 12 commits into from
Oct 27, 2020

Conversation

csuzhangxc
Copy link
Member

What is changed, added or deleted? (Required)

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

  • master (the latest development version, including v3.0 changes)
  • v2.0 (TiDB DM 2.0 versions)
  • v1.0 (TiDB DM 1.0 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
  • Have version specific changes
  • Might cause conflicts after cherry-picked

@yikeke yikeke changed the title zh: refine TLS docs; add a FQA about task upgrade zh: refine TLS docs; add a FAQ about task upgrade Oct 27, 2020
@csuzhangxc
Copy link
Member Author

@lance6716 @CharLotteiu PTAL

zh/enable-tls.md Outdated Show resolved Hide resolved
@CharLotteiu CharLotteiu added needs-cherry-pick-release-2.0 Should cherry pick this PR to release-2.0 branch. size/large Changes of a large size. status/PTAL This PR is ready for reviewing. translation/doing This PR’s assignee is translating this PR. labels Oct 27, 2020
Co-authored-by: Keke Yi <40977455+yikeke@users.noreply.github.com>
@CharLotteiu CharLotteiu self-assigned this Oct 27, 2020
zh/faq.md Outdated Show resolved Hide resolved
zh/generate-self-signed-certificates.md Outdated Show resolved Hide resolved
zh/manually-upgrade-dm-1.0-to-2.0.md Outdated Show resolved Hide resolved
@yikeke
Copy link
Contributor

yikeke commented Oct 27, 2020

Please request a tech review? @csuzhangxc

@csuzhangxc
Copy link
Member Author

Please request a tech review? @csuzhangxc

@lance6716 will do it.

csuzhangxc and others added 3 commits October 27, 2020 15:29
Co-authored-by: Keke Yi <40977455+yikeke@users.noreply.github.com>
Co-authored-by: Keke Yi <40977455+yikeke@users.noreply.github.com>
Co-authored-by: Keke Yi <40977455+yikeke@users.noreply.github.com>
zh/faq.md Outdated Show resolved Hide resolved
zh/faq.md Outdated Show resolved Hide resolved
Co-authored-by: Charlotte Liu <37295236+CharLotteiu@users.noreply.github.com>
Copy link
Contributor

@lance6716 lance6716 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

对于此错误,可使用以下方式之一进行处理:

- [使用 TiUP 导入 DM 1.0 集群到全新的 2.0 集群](maintain-dm-using-tiup.md#导入-dm-ansible-部署的-dm-10-集群并升级)。
- [手动将 DM 1.0 的数据迁移任务导入到 2.0 集群](manually-upgrade-dm-1.0-to-2.0.md)。
Copy link
Contributor

Choose a reason for hiding this comment

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

好像在“手动文档”中暂缺add column的操作

Copy link
Member Author

Choose a reason for hiding this comment

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

不加了吧,那样后续如果我们对其他 meta 表有更多的更新,还得加更多的手动步骤。直接让用户使用 checkpoint 去启一个新的 task 吧?

Co-authored-by: Charlotte Liu <37295236+CharLotteiu@users.noreply.github.com>
@lance6716
Copy link
Contributor

LGTM

@ti-srebot ti-srebot added the status/LGT1 Indicates that a PR has LGTM 1. label Oct 27, 2020
@yikeke
Copy link
Contributor

yikeke commented Oct 27, 2020

/merge

@yikeke yikeke merged commit 59e0a46 into pingcap:master Oct 27, 2020
@csuzhangxc csuzhangxc deleted the refine-tls branch October 27, 2020 10:15
@CharLotteiu
Copy link
Contributor

/run-cherry-picker

ti-srebot pushed a commit to ti-srebot/docs-dm that referenced this pull request Oct 27, 2020
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot
Copy link
Contributor

cherry pick to release-2.0 in PR #447

ti-srebot added a commit that referenced this pull request Oct 27, 2020
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@CharLotteiu CharLotteiu added translation/done This PR has been translated. and removed translation/doing This PR’s assignee is translating this PR. labels Oct 28, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
needs-cherry-pick-release-2.0 Should cherry pick this PR to release-2.0 branch. size/large Changes of a large size. status/LGT1 Indicates that a PR has LGTM 1. status/PTAL This PR is ready for reviewing. translation/done This PR has been translated.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants