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

executor: fix the incorrect untouch used in optimistic transactions (#30447) #30911

Merged
merged 7 commits into from
Apr 15, 2022
Merged

executor: fix the incorrect untouch used in optimistic transactions (#30447) #30911

merged 7 commits into from
Apr 15, 2022

Conversation

ti-srebot
Copy link
Contributor

@ti-srebot ti-srebot commented Dec 21, 2021 •
edited
Loading

cherry-pick #30447 to release-5.2
You can switch your code base to this Pull Request by using git-extras:

# In tidb repo:
git pr https://github.com/pingcap/tidb/pull/30911

After apply modifications, you can push your change to this PR via:

git push git@github.com:ti-srebot/tidb.git pr/30911:release-5.2-2b7ce8e61ffb

What problem does this PR solve?

Issue Number: close #30410

Problem Summary:

When the optimistic transaction is used, the untouched key optimization is not compatible with lazy existence check and results in data inconsistency.

What is changed and how it works?

Disable the untouched optimization for this situation when the presumeNotExist flag is set.

Check List

Tests

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

Side effects

Documentation

Release note

Fix the data inconsistency caused by invalid usage of lazy existence check and untouch key optimization.

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Dec 21, 2021 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • you06
  • youjiali1995

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-srebot
Copy link
Contributor Author

/run-all-tests

@ti-chi-bot ti-chi-bot added do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels Dec 21, 2021
@ti-srebot ti-srebot mentioned this pull request Dec 21, 2021
Merged
4 tasks
@ti-srebot ti-srebot added sig/execution SIG execution sig/transaction SIG:Transaction size/M Denotes a PR that changes 30-99 lines, ignoring generated files. type/5.2-cherry-pick type/bugfix This PR fixes a bug. labels Dec 21, 2021
@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 Dec 21, 2021
@ti-srebot
Copy link
Contributor Author

@cfzjywxk please accept the invitation then you can push to the cherry-pick pull requests. Comment with /cherry-pick-invite if the invitation is expired.
https://github.com/ti-srebot/tidb/invitations

@cfzjywxk cfzjywxk force-pushed the release-5.2-2b7ce8e61ffb branch from ee5c580 to 177cd05 Compare December 21, 2021 09:40
@ti-chi-bot ti-chi-bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Dec 21, 2021
you06
you06 approved these changes Dec 21, 2021
View reviewed changes
session/session.go Outdated
@@ -23,6 +23,7 @@ import (
"crypto/tls"
"encoding/json"
"fmt"
"github.com/pingcap/tidb/store/driver/txn"
Copy link
Contributor

Choose a reason for hiding this comment

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

Sort the imports.

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Dec 21, 2021
@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 Dec 28, 2021
@ti-chi-bot
Copy link
Member

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

Commit hash: 0b45cbd3fb97fb44c8c18794f716930e4746ee17

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Apr 15, 2022
@cfzjywxk cfzjywxk force-pushed the release-5.2-2b7ce8e61ffb branch from 80a6c4a to 6815aee Compare April 15, 2022 05:17
@ti-chi-bot ti-chi-bot removed the status/can-merge Indicates a PR has been approved by a committer. label Apr 15, 2022
@cfzjywxk
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 6815aee

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Apr 15, 2022
@ti-chi-bot ti-chi-bot removed the status/can-merge Indicates a PR has been approved by a committer. label Apr 15, 2022
@cfzjywxk
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 254eae0

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Apr 15, 2022
@ti-chi-bot ti-chi-bot removed the status/can-merge Indicates a PR has been approved by a committer. label Apr 15, 2022
@sre-bot
Copy link
Contributor

sre-bot commented Apr 15, 2022 •
edited
Loading

Code Coverage Details: https://codecov.io/github/pingcap/tidb/commit/4a1ecdb43640995664a8eec6dcfed20d77fcdae5

@winoros
Copy link
Member

winoros commented Apr 15, 2022

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: da676c4

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Apr 15, 2022
@winoros
Copy link
Member

winoros commented Apr 15, 2022

/run-mysql-test

@winoros
Copy link
Member

winoros commented Apr 15, 2022

/run-unit-test

@ti-chi-bot
Copy link
Member

@ti-srebot: Your PR was out of date, I have automatically updated it for you.

At the same time I will also trigger all tests for you:

/run-all-tests

If the CI test fails, you just re-trigger the test that failed and the bot will merge the PR for you after the CI passes.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the ti-community-infra/tichi repository.

@winoros
Copy link
Member

winoros commented Apr 15, 2022

/run-mysql-test

@ti-chi-bot ti-chi-bot merged commit 19dd2a6 into pingcap:release-5.2 Apr 15, 2022
@winoros winoros deleted the release-5.2-2b7ce8e61ffb branch April 15, 2022 07:16
@zhouqiang-cl zhouqiang-cl added this to the v5.2.4 milestone Apr 18, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@youjiali1995 youjiali1995 youjiali1995 approved these changes

@you06 you06 you06 approved these changes

@coocood coocood Awaiting requested review from coocood

@MyonKeminta MyonKeminta Awaiting requested review from MyonKeminta

@sticnarf sticnarf Awaiting requested review from sticnarf

@zyguan zyguan Awaiting requested review from zyguan

Assignees

@cfzjywxk cfzjywxk

Labels
cherry-pick-approved Cherry pick PR approved by release team. release-note Denotes a PR that will be considered when it comes time to generate release notes. sig/execution SIG execution sig/transaction SIG:Transaction size/M Denotes a PR that changes 30-99 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. type/bugfix This PR fixes a bug. type/5.2-cherry-pick
Projects
None yet
Milestone
v5.2.4
Development

Successfully merging this pull request may close these issues.
9 participants
@ti-srebot @ti-chi-bot @winoros @cfzjywxk @sre-bot @you06 @youjiali1995 @VelocityLight @zhouqiang-cl