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: add error code for write conflict #12878

Merged
merged 3 commits into from
Oct 25, 2019

Conversation

alivxxx
Copy link
Contributor

@alivxxx alivxxx commented Oct 22, 2019

What problem does this PR solve?

Add error code for write conflict, so we can know them directly in metrics.

What is changed and how it works?

Cherry picks codes that related to write conflict error code in #10432, #10466 and #10566.

Check List

Tests

  • Unit test

Code changes

  • Has exported function/method change

Side effects

  • None

Related changes

  • None

Release note

  • Add error code for write conflict errors.

Copy link
Member

@jackysp jackysp left a comment

Choose a reason for hiding this comment

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

LGTM

@jackysp jackysp requested review from lysu and coocood October 23, 2019 03:38
Copy link
Contributor

@lysu lysu left a comment

Choose a reason for hiding this comment

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

LGTM

@lysu lysu added the status/LGT2 Indicates that a PR has LGTM 2. label Oct 25, 2019
@jackysp jackysp added the status/can-merge Indicates a PR has been approved by a committer. label Oct 25, 2019
@sre-bot
Copy link
Contributor

sre-bot commented Oct 25, 2019

/run-all-tests

@sre-bot sre-bot merged commit fec3f28 into pingcap:release-2.1 Oct 25, 2019
@alivxxx alivxxx deleted the error-code branch October 25, 2019 07:01
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. status/LGT2 Indicates that a PR has LGTM 2.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants