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

txn: distinguish write conflict reasons #37735

Merged
merged 11 commits into from Sep 14, 2022
Merged

txn: distinguish write conflict reasons #37735

merged 11 commits into from Sep 14, 2022

Conversation

ekexium
Copy link
Contributor

@ekexium ekexium commented Sep 9, 2022 •
edited

What problem does this PR solve?

Issue Number: close #37734

Problem Summary:

Write conflicts errors are returnred for different purposes, we need to distingush them to that the error gives a clear message.

What is changed and how it works?

Check List

Tests

  • Unit test
  • Integration test
  • Manual test (add detailed scripts or steps below)
  • No code

Side effects

  • Performance regression: Consumes more CPU
  • Performance regression: Consumes more Memory
  • Breaking backward compatibility

Documentation

  • Affects user behaviors
  • Contains syntax changes
  • Contains variable changes
  • Contains experimental features
  • Changes MySQL compatibility

Release note

Please refer to Release Notes Language Style Guide to write a quality release note.

Distinguish different types of write conflict

@ekexium
distinguish different types of write conflicts
3f08028 
Signed-off-by: ekexium <eke@fastmail.com>
@ekexium
add a test
2c8fafc 
Signed-off-by: ekexium <eke@fastmail.com>
@ekexium
Merge branch 'master' of github.com:pingcap/tidb into write-conflict-…
05495a3 
…reason
@ti-chi-bot
Copy link
Member

ti-chi-bot commented Sep 9, 2022 •
edited

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • cfzjywxk
  • sticnarf

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 submitting an approval review.
Reviewer can cancel approval by submitting a request changes review.

@ti-chi-bot ti-chi-bot added release-note size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Sep 9, 2022
@ekexium
make errdoc
d83c2cc 
Signed-off-by: ekexium <eke@fastmail.com>
@ekexium
fix test
a392d38 
Signed-off-by: ekexium <eke@fastmail.com>
@ekexium
Copy link
Contributor Author

ekexium commented Sep 9, 2022

Let's wait tikv/client-go#584 and merge it together.

@ekexium
update client-go
f5daec6 
Signed-off-by: ekexium <eke@fastmail.com>
TonsnakeLin
TonsnakeLin reviewed Sep 13, 2022
View reviewed changes
tests/realtikvtest/pessimistictest/pessimistic_test.go
@@ -3237,14 +3237,15 @@ func TestLazyUniquenessCheck(t *testing.T) {
tk.MustQuery("select * from t2").Check(testkit.Rows("1 12"))
tk.MustExec("admin check table t")

// case: conflict check failure
// case: conflict check failure, it doesn't commit in the optimistic way though there is no lock acquired in the txn
Copy link
Contributor

Choose a reason for hiding this comment

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

It's better to add more test cases for other conflict reasons.
The reset LGTM

@ekexium
add a test case of reason=Optimistic
b70a287 
Signed-off-by: ekexium <eke@fastmail.com>
cfzjywxk
cfzjywxk approved these changes Sep 14, 2022
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 Sep 14, 2022
@ekexium
refactor test
045f32b 
Signed-off-by: ekexium <eke@fastmail.com>
@ti-chi-bot ti-chi-bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Sep 14, 2022
sticnarf
sticnarf approved these changes Sep 14, 2022
View reviewed changes
Copy link
Contributor

@sticnarf sticnarf 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 status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Sep 14, 2022
@sticnarf
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 045f32b

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Sep 14, 2022
ti-chi-bot and others added 2 commits September 14, 2022 13:18
@ti-chi-bot
Merge branch 'master' into write-conflict-reason
89f2acb
@ekexium
fix test
6c23f02 
Signed-off-by: ekexium <eke@fastmail.com>
@ti-chi-bot ti-chi-bot removed the status/can-merge Indicates a PR has been approved by a committer. label Sep 14, 2022
@sticnarf
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 4343d41

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Sep 14, 2022
@ti-chi-bot ti-chi-bot merged commit 884898b into pingcap:master Sep 14, 2022
@sre-bot
Copy link
Contributor

sre-bot commented Sep 14, 2022

TiDB MergeCI notify

🔴 Bad News! New failing [1] after this pr merged.
These new failed integration tests seem to be caused by the current PR, please try to fix these new failed integration tests, thanks!

CI Name Result Duration Compare with Parent commit
idc-jenkins-ci-tidb/integration-ddl-test 🟥 failed 1, success 5, total 6 23 min New failing
idc-jenkins-ci-tidb/integration-common-test 🔴 failed 2, success 15, total 17 9 min 23 sec Existing failure
idc-jenkins-ci/integration-cdc-test 🟢 all 37 tests passed 27 min Existing passed
idc-jenkins-ci-tidb/common-test 🟢 all 11 tests passed 9 min 44 sec Existing passed
idc-jenkins-ci-tidb/tics-test 🟢 all 1 tests passed 5 min 41 sec Existing passed
idc-jenkins-ci-tidb/sqllogic-test-2 🟢 all 28 tests passed 4 min 39 sec Existing passed
idc-jenkins-ci-tidb/sqllogic-test-1 🟢 all 26 tests passed 4 min 33 sec Existing passed
idc-jenkins-ci-tidb/mybatis-test 🟢 all 1 tests passed 3 min 26 sec Existing passed
idc-jenkins-ci-tidb/integration-compatibility-test 🟢 all 1 tests passed 3 min 10 sec Existing passed
idc-jenkins-ci-tidb/plugin-test 🟢 build success, plugin test success 4min Existing passed

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@TonsnakeLin TonsnakeLin TonsnakeLin left review comments

@cfzjywxk cfzjywxk cfzjywxk approved these changes

@sticnarf sticnarf sticnarf approved these changes

@you06 you06 Awaiting requested review from you06

Assignees
No one assigned
Labels
release-note 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.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Distinguish different types of write conflicts
6 participants
@ekexium @ti-chi-bot @sticnarf @sre-bot @cfzjywxk @TonsnakeLin