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

retry(dm): align with tidb latest error message (#4172) #4252

Merged
merged 2 commits into from
Jan 10, 2022
Merged

retry(dm): align with tidb latest error message (#4172) #4252

merged 2 commits into from
Jan 10, 2022

Conversation

ti-chi-bot
Copy link
Member

This is an automated cherry-pick of #4172

What problem does this PR solve?

Issue Number: close #4159 , close #4246

What is changed and how it works?

since tidb has changed the error message, we should also update the matching pattern

Check List

Tests

  • Integration test

Release note 

 `None`.

@ti-chi-bot
Copy link
Member Author

[REVIEW NOTIFICATION]

This pull request has not been approved.

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 submitting an approval review.
Reviewer can cancel approval by submitting a request changes review.

@ti-chi-bot ti-chi-bot added release-note-none Denotes a PR that doesn't merit a release note. do-not-merge/cherry-pick-not-approved labels Jan 10, 2022
@ti-chi-bot ti-chi-bot mentioned this pull request Jan 10, 2022
Merged
@ti-chi-bot ti-chi-bot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. status/LGT2 Indicates that a PR has LGTM 2. type/cherry-pick-for-release-5.4 This PR is cherry-picked to release-5.4 from a source PR. labels Jan 10, 2022
@okJiang okJiang added the type/bugfix This PR fixes a bug. label Jan 10, 2022
@Ehco1996
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member Author

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

Commit hash: 8f7817b

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Jan 10, 2022
@lance6716 lance6716 added the area/dm Issues or PRs related to DM. label Jan 10, 2022
@nongfushanquan nongfushanquan added cherry-pick-approved Cherry pick PR approved by release team. and removed do-not-merge/cherry-pick-not-approved labels Jan 10, 2022
@lance6716
Copy link
Contributor

/run-dm-integration-test
/run-integration-test
/run-kafka-integration-test

@lance6716
Copy link
Contributor

/run-dm-compatibility-test

@lance6716
Copy link
Contributor

/run-kafka-integration-test

@ti-chi-bot ti-chi-bot merged commit eefcdf2 into pingcap:release-5.4 Jan 10, 2022
@overvenus overvenus added this to the v5.4.0 milestone Jan 12, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@okJiang okJiang okJiang approved these changes

Assignees

@lance6716 lance6716

Labels
area/dm Issues or PRs related to DM. cherry-pick-approved Cherry pick PR approved by release team. release-note-none Denotes a PR that doesn't merit a release note. 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/LGT2 Indicates that a PR has LGTM 2. type/bugfix This PR fixes a bug. type/cherry-pick-for-release-5.4 This PR is cherry-picked to release-5.4 from a source PR.
Projects
None yet
Milestone
v5.4.0
Development

Successfully merging this pull request may close these issues.
6 participants
@ti-chi-bot @Ehco1996 @lance6716 @okJiang @overvenus @nongfushanquan