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

pessimistic-txn: resolve all optimistic locks when non-pessimistic lock conflict occurs #4883

Merged

Conversation

@youjiali1995
Copy link
Contributor

youjiali1995 commented Jun 13, 2019

Signed-off-by: youjiali1995 zlwgx1023@gmail.com

What have you changed? (mandatory)

Resolve all optimistic locks when non-pessimistic lock conflict occurs.

What are the type of the changes? (mandatory)

  • Bug fix (change which fixes an issue)

How has this PR been tested? (mandatory)

manual tests

Does this PR affect documentation (docs) or release note? (mandatory)

no

Does this PR affect tidb-ansible update? (mandatory)

no

…ck conflict occours.

Signed-off-by: youjiali1995 <zlwgx1023@gmail.com>
@youjiali1995

This comment has been minimized.

Copy link
Contributor Author

youjiali1995 commented Jun 13, 2019

@coocood

This comment has been minimized.

Copy link
Contributor

coocood commented Jun 13, 2019

LGTM

@overvenus overvenus added the C: Txn label Jun 13, 2019
Copy link
Member

zhangjinpeng1987 left a comment

LGTM
@MyonKeminta PTAL

@AndreMouche AndreMouche merged commit 8d69c7a into tikv:master Jun 13, 2019
2 checks passed
2 checks passed
DCO All commits are signed off!
Details
idc-jenkins-ci/test Jenkins job succeeded.
Details
youjiali1995 added a commit to youjiali1995/tikv that referenced this pull request Jun 13, 2019
…ck conflict occurs (tikv#4883)

Signed-off-by: youjiali1995 <zlwgx1023@gmail.com>
youjiali1995 added a commit to youjiali1995/tikv that referenced this pull request Jun 13, 2019
…ck conflict occurs (tikv#4883)

Signed-off-by: youjiali1995 <zlwgx1023@gmail.com>
youjiali1995 added a commit to youjiali1995/tikv that referenced this pull request Jun 13, 2019
…ck conflict occurs (tikv#4883)

Signed-off-by: youjiali1995 <zlwgx1023@gmail.com>
sticnarf pushed a commit to sticnarf/tikv that referenced this pull request Oct 27, 2019
…ck conflict occurs (tikv#4883)

Signed-off-by: youjiali1995 <zlwgx1023@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
5 participants
You can’t perform that action at this time.