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

store/tikv: do not backoff when PessimisticLock return locked error #13110

Merged
merged 2 commits into from Nov 4, 2019

Conversation

tiancaiamao
Copy link
Contributor

What problem does this PR solve?

When PessimisticLock gets a locked error, TiKV has already back off before returning the response, so it's unnecessary to back off again in TiDB.

What is changed and how it works?

Reset the change here:

https://github.com/pingcap/tidb/pull/12852/files#diff-499c236856cd9ce3300d3f5ccde41a23R721

Check List

Tests

  • No code

@tiancaiamao
Copy link
Contributor Author

PTAL @coocood

@codecov
Copy link

codecov bot commented Nov 4, 2019

Codecov Report

Merging #13110 into master will not change coverage.
The diff coverage is n/a.

@@             Coverage Diff             @@
##             master     #13110   +/-   ##
===========================================
  Coverage   80.2495%   80.2495%           
===========================================
  Files           468        468           
  Lines        111172     111172           
===========================================
  Hits          89215      89215           
  Misses        15158      15158           
  Partials       6799       6799

@coocood
Copy link
Member

coocood commented Nov 4, 2019

LGTM

@tiancaiamao
Copy link
Contributor Author

PTAL @lysu

@cfzjywxk
Copy link
Contributor

cfzjywxk commented Nov 4, 2019

LGTM

@coocood
Copy link
Member

coocood commented Nov 4, 2019

/merge

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

sre-bot commented Nov 4, 2019

/run-all-tests

@sre-bot sre-bot merged commit 66a311c into pingcap:master Nov 4, 2019
@sre-bot
Copy link
Contributor

sre-bot commented Nov 4, 2019

cherry pick to release-3.0 failed

@sre-bot
Copy link
Contributor

sre-bot commented Nov 4, 2019

cherry pick to release-3.1 failed

@crazycs520
Copy link
Contributor

@tiancaiamao need cherry-pick 3.1?

@tiancaiamao tiancaiamao deleted the pessimistic-lock-backoff branch May 26, 2020 09:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
component/tikv status/can-merge Indicates a PR has been approved by a committer.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants