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

tikv: choose right primary only contains SelectForUpdate & Delete-your-writes (#18264) #18291

Merged
merged 5 commits into from
Jul 8, 2020
Merged

tikv: choose right primary only contains SelectForUpdate & Delete-your-writes (#18264) #18291

merged 5 commits into from
Jul 8, 2020

Conversation

ti-srebot
Copy link
Contributor

cherry-pick #18264 to release-4.0

What problem does this PR solve?

Problem Summary:

questions found follow by #18244

add test case that:

  1. txn full with Delete-Your-Writes, should commit success
  2. txn with Delete-Your-Writes and SelectForUpdate but write nothing.
  1. will pass
  2. will have problem that choose wrong primary key too.

https://github.com/pingcap/tidb/pull/18264/files#diff-d11e207d2529a00e79d72b84ae5172caR800 will fail

What is changed and how it works?

Proposal: xxx

What's Changed, How it Works:

  • add test case
  • fix txn only contain SFU choose wrong primary key problem

Related changes

  • Need to cherry-pick to the release branch

Check List

Tests

  • Unit test

Side effects

  • N/A

Release note

This change is Reviewable

@lysu @ti-srebot
cherry pick pingcap#18264 to release-4.0
1a08b5f 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot
Copy link
Contributor Author

/run-all-tests

@ti-srebot ti-srebot mentioned this pull request Jun 30, 2020
Merged
@ti-srebot ti-srebot added sig/transaction SIG:Transaction type/4.0-cherry-pick type/bugfix This PR fixes a bug. labels Jun 30, 2020
@ti-srebot ti-srebot added this to the v4.0.2 milestone Jun 30, 2020
jackysp
jackysp reviewed Jun 30, 2020
View reviewed changes
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

@ti-srebot
Copy link
Contributor Author

@jackysp,Thanks for you review.

@lysu lysu modified the milestones: v4.0.2, v4.0.3 Jul 1, 2020
@tiancaiamao
Copy link
Contributor

CI fail @lysu

@lysu
Copy link
Contributor

lysu commented Jul 7, 2020

/run-all-tests

@coocood
Copy link
Member

coocood commented Jul 8, 2020

LGTM

@ti-srebot
Copy link
Contributor Author

@coocood,Thanks for your review.

@ti-srebot ti-srebot added the status/LGT2 Indicates that a PR has LGTM 2. label Jul 8, 2020
@jackysp
Copy link
Member

jackysp commented Jul 8, 2020

/merge

@ti-srebot ti-srebot added the status/can-merge Indicates a PR has been approved by a committer. label Jul 8, 2020
@ti-srebot
Copy link
Contributor Author

/run-all-tests

@ti-srebot
Copy link
Contributor Author

@ti-srebot merge failed.

@lysu
Copy link
Contributor

lysu commented Jul 8, 2020

/run-unit-test

@jackysp
Copy link
Member

jackysp commented Jul 8, 2020

/merge

@ti-srebot
Copy link
Contributor Author

/run-all-tests

@ti-srebot
Copy link
Contributor Author

@ti-srebot merge failed.

@jackysp
Copy link
Member

jackysp commented Jul 8, 2020

/run-integration-copr-test
/run-unit-test

@jackysp jackysp merged commit 8895dc0 into pingcap:release-4.0 Jul 8, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jackysp jackysp jackysp approved these changes

@cfzjywxk cfzjywxk Awaiting requested review from cfzjywxk

@coocood coocood Awaiting requested review from coocood

@tiancaiamao tiancaiamao Awaiting requested review from tiancaiamao

Assignees

@lysu lysu

Labels
sig/transaction SIG:Transaction status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2. type/bugfix This PR fixes a bug. type/4.0-cherry-pick
Projects
None yet
Milestone
v4.0.3
Development

Successfully merging this pull request may close these issues.
5 participants
@ti-srebot @tiancaiamao @lysu @coocood @jackysp