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

TiCDC: add trouble shooting info about DDL failures (#5449) (#5776) #5807

Merged
merged 3 commits into from
Mar 24, 2021
Merged

TiCDC: add trouble shooting info about DDL failures (#5449) (#5776) #5807

merged 3 commits into from
Mar 24, 2021

Conversation

ti-srebot
Copy link
Contributor

@ti-srebot ti-srebot commented Mar 24, 2021 •
edited
Loading

cherry-pick #5776 to master
You can switch your code base to this Pull Request by using git-extras:

# In docs-cn repo:
git pr https://github.com/pingcap/docs-cn/pull/5807

After apply modifications, you can push your change to this PR via:

git push git@github.com:ti-srebot/docs-cn.git pr/5807:master-ed857f344871

cherry-pick #5449 to release-5.0
You can switch your code base to this Pull Request by using git-extras:

# In docs-cn repo:
git pr https://github.com/pingcap/docs-cn/pull/5776

After apply modifications, you can push your change to this PR via:

git push git@github.com:ti-srebot/docs-cn.git pr/5776:release-5.0-ef8ef4414154

What is changed, added or deleted? (Required)

Added information on how to handle DDL failures after 4.0.11

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

4.0.11 or above，5.0.0-rc excluded.

  • 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)?

https://github.com/pingcap/ticdc/pull/1291
https://github.com/pingcap/ticdc/pull/1352

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-srebot
cherry pick pingcap#5776 to master
cee0e12 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot ti-srebot mentioned this pull request Mar 24, 2021
Merged
10 tasks
@ti-srebot ti-srebot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. status/PTAL This PR is ready for reviewing. type/cherry-pick-for-release-5.0 This PR is cherry-picked to release-5.0 from a source PR. type/master-cherry-pick v5.0 This PR/issue applies to TiDB v5.0 labels Mar 24, 2021
@ti-srebot ti-srebot self-assigned this Mar 24, 2021
@ti-srebot
Copy link
Contributor Author

@ti-srebot you're already a collaborator in bot's repo.

@ti-chi-bot ti-chi-bot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Mar 24, 2021
@TomShawn
Copy link
Contributor

/remove-type 5.0-cherry-pick

@ti-chi-bot ti-chi-bot removed the type/cherry-pick-for-release-5.0 This PR is cherry-picked to release-5.0 from a source PR. label Mar 24, 2021
@ti-chi-bot
Copy link
Member

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • yikeke

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 24, 2021
@liuzix
Copy link
Contributor

liuzix commented Mar 24, 2021

/lgtm

@ti-chi-bot
Copy link
Member

@liuzix: /lgtm is only allowed for the reviewers in list.

In response to this:

/lgtm

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the ti-community-infra/tichi repository.

@TomShawn
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member

@TomShawn: /merge in this pull request requires 2 /lgtm.

In response to this:

/merge

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the ti-community-infra/tichi repository.

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

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 6348929

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Mar 24, 2021
@ti-chi-bot ti-chi-bot merged commit e84adf6 into pingcap:master Mar 24, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@yikeke yikeke yikeke approved these changes

@amyangfei amyangfei Awaiting requested review from amyangfei

@zier-one zier-one Awaiting requested review from zier-one

@liuzix liuzix Awaiting requested review from liuzix

@TomShawn TomShawn Awaiting requested review from TomShawn

Assignees

@ti-srebot ti-srebot

Labels
require-LGT1 Indicates that the PR requires an LGTM. size/XS Denotes a PR that changes 0-9 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. 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.
5 participants
@ti-srebot @TomShawn @ti-chi-bot @liuzix @yikeke