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

store/tikv: not setting special ts when resolving async locks #22723

Merged
merged 6 commits into from
Apr 30, 2021
Merged

store/tikv: not setting special ts when resolving async locks #22723

merged 6 commits into from
Apr 30, 2021

Conversation

sticnarf
Copy link
Contributor

@sticnarf sticnarf commented Feb 4, 2021 •
edited
Loading

What problem does this PR solve?

Issue Number: close #24384

What is changed and how it works?

TiKV always returns the lock information if it is an async-commit lock, so we don't need to set these special ts.

And after setting these timestamps, check_txn_status cannot roll back expired locks according to current_ts, which leads to issue #24384.

Related changes

  • Need to cherry-pick to the release branch

Check List

Tests

  • Unit test

Release note

  • Fix the bug that primary lock fallen back from async commit cannot be resolved.

@sticnarf
store/tikv: not setting special ts for async locks
132cf2c 
Signed-off-by: Yilin Chen <sticnarf@gmail.com>
@sticnarf sticnarf added the sig/transaction SIG:Transaction label Feb 5, 2021
@ti-chi-bot ti-chi-bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Apr 29, 2021
@sticnarf
add unit tests
81b2197 
Signed-off-by: Yilin Chen <sticnarf@gmail.com>
@ti-chi-bot ti-chi-bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Apr 29, 2021
@sticnarf sticnarf added the type/bugfix This PR fixes a bug. label Apr 29, 2021
@ti-chi-bot ti-chi-bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Apr 29, 2021
@sticnarf sticnarf marked this pull request as ready for review April 29, 2021 18:00
@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 Apr 29, 2021
@sticnarf
Copy link
Contributor Author

/run-all-tests

@ichn-hu ichn-hu mentioned this pull request Apr 29, 2021
Closed
cfzjywxk
cfzjywxk reviewed Apr 30, 2021
View reviewed changes
Copy link
Contributor

@cfzjywxk cfzjywxk left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Apr 30, 2021
@ti-chi-bot
Copy link
Member

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • cfzjywxk
  • 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 writing /lgtm in a comment.
Reviewer can cancel approval by writing /lgtm cancel in a comment.

@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 Apr 30, 2021
@youjiali1995
Copy link
Contributor 

[2021-04-29T18:06:15.864Z] --- FAIL: TestInfo (0.33s)
[2021-04-29T18:06:15.864Z]     domain_test.go:211: etcdserver: requested lease not found
[2021-04-29T18:06:15.864Z] FAIL
[2021-04-29T18:06:15.864Z] FAIL	github.com/pingcap/tidb/domain	1.137s
[2021-04-29T18:06:24.022Z] === RUN   TestExplainAnalyzeInvokeNextAndClose
[2021-04-29T18:06:24.022Z] --- PASS: TestExplainAnalyzeInvokeNextAndClose (0.00s)

@youjiali1995
Copy link
Contributor

/run-unit-test

@youjiali1995
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 983c39b

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Apr 30, 2021
@youjiali1995
Copy link
Contributor

/merge

@ti-chi-bot ti-chi-bot merged commit b77338d into pingcap:master Apr 30, 2021
@ti-srebot ti-srebot mentioned this pull request Apr 30, 2021
Merged
@ti-srebot
Copy link
Contributor

cherry pick to release-5.0 in PR #24397

sticnarf added a commit to ti-srebot/tidb that referenced this pull request Apr 30, 2021
@sticnarf
cherry pick pingcap#22723 to release-5.0
dbce38f 
Signed-off-by: Yilin Chen <sticnarf@gmail.com>
@amyangfei amyangfei mentioned this pull request Apr 30, 2021
Closed
ti-chi-bot pushed a commit that referenced this pull request May 26, 2021
@ti-srebot
store/tikv: not setting special ts when resolving async locks (#22723) (
59aaf95 
#24397)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cfzjywxk cfzjywxk cfzjywxk left review comments

@youjiali1995 youjiali1995 youjiali1995 approved these changes

@MyonKeminta MyonKeminta Awaiting requested review from MyonKeminta

Assignees
No one assigned
Labels
needs-cherry-pick-release-5.0 sig/transaction SIG:Transaction size/L Denotes a PR that changes 100-499 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.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Primary lock fallen back from async commit cannot be resolved
5 participants
@sticnarf @ti-chi-bot @youjiali1995 @ti-srebot @cfzjywxk