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

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

Merged
merged 5 commits into from
Aug 20, 2021
Merged

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

merged 5 commits into from
Aug 20, 2021

Conversation

MyonKeminta
Copy link
Contributor

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

@MyonKeminta MyonKeminta added the sig/transaction SIG:Transaction label Aug 20, 2021
@ti-chi-bot
Copy link
Member

ti-chi-bot commented Aug 20, 2021 •
edited
Loading

[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/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 05:21
@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
@lysu
Copy link
Contributor

lysu commented Aug 20, 2021

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: e1121f1

@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
Copy link
Member

@MyonKeminta: Your PR was out of date, I have automatically updated it for you.

At the same time I will also trigger all tests for you:

/run-all-tests

If the CI test fails, you just re-trigger the test that failed and the bot will merge the PR for you after the CI passes.

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.

1 similar comment
@ti-chi-bot
Copy link
Member

@MyonKeminta: Your PR was out of date, I have automatically updated it for you.

At the same time I will also trigger all tests for you:

/run-all-tests

If the CI test fails, you just re-trigger the test that failed and the bot will merge the PR for you after the CI passes.

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.

@MyonKeminta
Copy link
Contributor Author

/merge

@MyonKeminta
Copy link
Contributor Author

/run-unit-test

@zhouqiang-cl zhouqiang-cl reopened this Aug 20, 2021
@MyonKeminta
Copy link
Contributor Author

/merge

@zhouqiang-cl zhouqiang-cl reopened this Aug 20, 2021
@zhouqiang-cl
Copy link
Contributor

/run-unit-test

@ti-chi-bot ti-chi-bot merged commit 3ea7851 into pingcap:master Aug 20, 2021
@MyonKeminta MyonKeminta deleted the m/fix-collect-retryable-deadlock branch August 20, 2021 07:28
@MyonKeminta MyonKeminta mentioned this pull request Aug 20, 2021
Merged
2 tasks
ti-chi-bot pushed a commit that referenced this pull request Aug 20, 2021
@MyonKeminta
*: Update client-go to fix retryable deadlock information collecting …
deb6d0d 
…of information_schema.deadlocks (#27413) (#27427)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@youjiali1995 youjiali1995 youjiali1995 approved these changes

@longfangsong longfangsong longfangsong approved these changes

@lysu lysu lysu approved these changes

Assignees
No one assigned
Labels
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.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

information_schema.deadlocks incorrectly collects retryable deadlocks as if it's non-retryble
6 participants
@MyonKeminta @ti-chi-bot @lysu @zhouqiang-cl @longfangsong @youjiali1995