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

*: Update client-go to fix retryable deadlock information collecting of information_schema.deadlocks (#27413) #27427

Conversation

MyonKeminta
Copy link
Contributor

Cherry-picks #27413

What problem does this PR solve?

Issue Number: close #27400

Problem Summary: The information about retryable deadlocks is collected incorrectly as if they are non-retryable ones. Currently the bug is in client-go, and this PR fixes this problem by updating client-go.

What is changed and how it works?

What's Changed: Updates client-go

Requires tikv/client-go#274

Needs to be picked to 5.2 and 5.1 branch, bug will be done manually.

Check List

Tests

  • Unit test
  • Integration test

Side effects

  • None

Documentation

  • None

Release note

None

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Aug 20, 2021

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • longfangsong
  • youjiali1995

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 do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Aug 20, 2021
@MyonKeminta MyonKeminta marked this pull request as ready for review August 20, 2021 07:28
@ti-chi-bot ti-chi-bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Aug 20, 2021
@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Aug 20, 2021
@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 Aug 20, 2021
@MyonKeminta
Copy link
Contributor Author

/build

@zhouqiang-cl zhouqiang-cl added the cherry-pick-approved Cherry pick PR approved by release team. label Aug 20, 2021
@MyonKeminta
Copy link
Contributor Author

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 20a8ee2

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Aug 20, 2021
@ti-chi-bot ti-chi-bot merged commit deb6d0d into pingcap:release-5.2 Aug 20, 2021
@MyonKeminta MyonKeminta deleted the m/5.2-fix-collect-retryable-deadlock branch August 20, 2021 08:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cherry-pick-approved Cherry pick PR approved by release team. release-note-none Denotes a PR that doesn't merit a release note. sig/transaction SIG:Transaction 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/5.2-cherry-pick
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants