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

txn: Keep pessimistic lock's TTL if it's greater than prewrite reques… #6056

Merged

Conversation

MyonKeminta
Copy link
Contributor

@MyonKeminta MyonKeminta commented Nov 26, 2019

…t's ttl (#5737)

Signed-off-by: MyonKeminta MyonKeminta@users.noreply.github.com

What have you changed?

cherry-pick #5737 to release-3.0

If a pessimistic prewrite request arrives and it carries a smaller TTL than that already wrote in the pessimistic lock, keep the pessimistic lock's TTL rather than use the TTL in the reqeust.

for more detail, please check #5737.

What is the type of the changes?

  • Improvement (a change which is an improvement to an existing feature)

How is the PR tested?

  • Unit test

Does this PR affect documentation (docs) or should it be mentioned in the release notes?

Yes.

Does this PR affect tidb-ansible?

No.

MyonKeminta and others added 2 commits November 26, 2019 20:54
…t's ttl (tikv#5737)

Signed-off-by: MyonKeminta <MyonKeminta@users.noreply.github.com>
Signed-off-by: MyonKeminta <MyonKeminta@users.noreply.github.com>
@MyonKeminta MyonKeminta added sig/transaction SIG: Transaction type/cherry-pick Type: PR - Cherry pick priority/release-blocker This issue blocks a release. Please solve it ASAP. labels Nov 26, 2019
@MyonKeminta MyonKeminta added this to the v3.0.6 milestone Nov 26, 2019
@AndreMouche
Copy link
Member

/merge

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

sre-bot commented Nov 26, 2019

/run-all-tests

@AndreMouche AndreMouche merged commit b28eb78 into tikv:release-3.0 Nov 26, 2019
@MyonKeminta MyonKeminta deleted the m/3.0-pessimistic-prewrite-max-ttl branch November 26, 2019 13:26
MyonKeminta added a commit to MyonKeminta/tikv that referenced this pull request Nov 26, 2019
MyonKeminta added a commit to MyonKeminta/tikv that referenced this pull request Nov 26, 2019
…#6056)

Signed-off-by: MyonKeminta <MyonKeminta@users.noreply.github.com>
sre-bot pushed a commit that referenced this pull request Nov 29, 2019
… (#6059)

Signed-off-by: MyonKeminta <MyonKeminta@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
priority/release-blocker This issue blocks a release. Please solve it ASAP. sig/transaction SIG: Transaction status/can-merge Indicates a PR has been approved by a committer. type/cherry-pick Type: PR - Cherry pick
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants