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 tikv/client-go to fix lock nowait bug #32753

Merged
merged 11 commits into from
Mar 3, 2022
Merged

*: update tikv/client-go to fix lock nowait bug #32753

merged 11 commits into from
Mar 3, 2022

Conversation

sticnarf
Copy link
Contributor

@sticnarf sticnarf commented Mar 2, 2022 •
edited
Loading

Signed-off-by: Yilin Chen [email protected]

What problem does this PR solve?

Issue Number: close #32754

What is changed and how it works?

Update client-go to include the fix tikv/client-go#435

Check List

Tests

  • Unit test
  • Integration test
  • Manual test (add detailed scripts or steps below)
  • No code

Release note

Fix the bug that locking with NOWAIT does not return immediately when encountering a lock.

@sticnarf sticnarf requested a review from disksing March 2, 2022 13:16
@ti-chi-bot
Copy link
Member

ti-chi-bot commented Mar 2, 2022 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • disksing
  • hawkingrei

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 do-not-merge/needs-linked-issue release-note Denotes a PR that will be considered when it comes time to generate release notes. do-not-merge/needs-triage-completed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. and removed do-not-merge/needs-linked-issue labels Mar 2, 2022
@sre-bot
Copy link
Contributor

sre-bot commented Mar 2, 2022 •
edited
Loading

Code Coverage Details: https://codecov.io/github/pingcap/tidb/commit/9344702a658e5e964ead3c3eecb0dada6fdcf80a

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Mar 2, 2022
@ti-chi-bot ti-chi-bot added status/LGT2 Indicates that a PR has LGTM 2. needs-cherry-pick-release-5.2 needs-cherry-pick-release-5.3 Type: Need cherry pick to release-5.3 needs-cherry-pick-release-5.4 Should cherry pick this PR to release-5.4 branch. and removed status/LGT1 Indicates that a PR has LGTM 1. do-not-merge/needs-triage-completed labels Mar 2, 2022
@sticnarf
Copy link
Contributor Author

sticnarf commented Mar 3, 2022

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: c951ad2

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Mar 3, 2022
@sticnarf
Copy link
Contributor Author

sticnarf commented Mar 3, 2022 •
edited
Loading

The CI failure seems unrelated. Let's try again
/run-unit-tests

@sticnarf
Copy link
Contributor Author

sticnarf commented Mar 3, 2022

/run-all-tests

@hawkingrei
Copy link
Member

/run-unit-test

@sticnarf
Copy link
Contributor Author

sticnarf commented Mar 3, 2022

/run-unit-test

@hawkingrei
Copy link
Member

/run-unit-test

@ti-chi-bot ti-chi-bot merged commit 2878195 into pingcap:master Mar 3, 2022
ti-srebot pushed a commit to ti-srebot/tidb that referenced this pull request Mar 3, 2022
@sticnarf @ti-srebot
cherry pick pingcap#32753 to release-5.2
95bc68b 
Signed-off-by: ti-srebot <[email protected]>
@ti-srebot ti-srebot mentioned this pull request Mar 3, 2022
Closed
4 tasks
@ti-srebot
Copy link
Contributor

cherry pick to release-5.2 in PR #32810

ti-srebot pushed a commit to ti-srebot/tidb that referenced this pull request Mar 3, 2022
@sticnarf @ti-srebot
cherry pick pingcap#32753 to release-5.3
2db7cac 
Signed-off-by: ti-srebot <[email protected]>
@ti-srebot ti-srebot mentioned this pull request Mar 3, 2022
Closed
4 tasks
@ti-srebot
Copy link
Contributor

cherry pick to release-5.3 in PR #32811

@ti-srebot ti-srebot mentioned this pull request Mar 3, 2022
Merged
4 tasks
ti-srebot pushed a commit to ti-srebot/tidb that referenced this pull request Mar 3, 2022
@sticnarf @ti-srebot
cherry pick pingcap#32753 to release-5.4
e94b8e4 
Signed-off-by: ti-srebot <[email protected]>
@ti-srebot
Copy link
Contributor

cherry pick to release-5.4 in PR #32812

ti-chi-bot pushed a commit that referenced this pull request Apr 25, 2022
@ti-srebot
*: update tikv/client-go to fix lock nowait bug (#32753) (#32812)
9e4a150 
close #32754
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@disksing disksing disksing approved these changes

@hawkingrei hawkingrei hawkingrei approved these changes

Assignees
No one assigned
Labels
needs-cherry-pick-release-5.2 needs-cherry-pick-release-5.3 Type: Need cherry pick to release-5.3 needs-cherry-pick-release-5.4 Should cherry pick this PR to release-5.4 branch. release-note Denotes a PR that will be considered when it comes time to generate release notes. 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.

NOWAIT does not have effect in pessimistic locking
6 participants
@sticnarf @ti-chi-bot @sre-bot @hawkingrei @ti-srebot @disksing