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

txn: write protected rollback when cleanup with missing lock (#7365) #7388

Merged
merged 1 commit into from
Apr 8, 2020

Conversation

sticnarf
Copy link
Contributor

@sticnarf sticnarf commented Apr 8, 2020

cherry-pick #7365 to release-3.0


Signed-off-by: Dian Luo andylokandy@hotmail.com

What problem does this PR solve?

Closes #7364

MvccTxn::check_txn_status_missing_lock() now writes protected on rollback.

Check List

Tests

  • Unit test
  • Integration test

Release note

Fix the bug that a repeated "resolve lock" request may break the atomicity of transactions.

Signed-off-by: Yilin Chen <sticnarf@gmail.com>
@sticnarf sticnarf added sig/transaction SIG: Transaction type/cherry-pick Type: PR - Cherry pick type/bugfix This PR fixes a bug. labels Apr 8, 2020
@sticnarf sticnarf changed the title cherry-pick #7365 to release-3.0 txn: write protected rollback when cleanup with missing lock (#7365) Apr 8, 2020
@youjiali1995 youjiali1995 added this to the v3.0.13 milestone Apr 8, 2020
@youjiali1995
Copy link
Contributor

/merge

@sre-bot sre-bot added the status/can-merge Indicates a PR has been approved by a committer. label Apr 8, 2020
@sre-bot
Copy link
Contributor

sre-bot commented Apr 8, 2020

Your auto merge job has been accepted, waiting for 7381

@sre-bot
Copy link
Contributor

sre-bot commented Apr 8, 2020

/run-all-tests

@sre-bot sre-bot merged commit 832fa78 into tikv:release-3.0 Apr 8, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
sig/transaction SIG: Transaction status/can-merge Indicates a PR has been approved by a committer. type/bugfix This PR fixes a bug. type/cherry-pick Type: PR - Cherry pick
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants