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

store/tikv: fix lockTTL too large if local time is behind timestamp (#13865) #13868

Merged
merged 1 commit into from
Dec 3, 2019
Merged

store/tikv: fix lockTTL too large if local time is behind timestamp (#13865) #13868

merged 1 commit into from
Dec 3, 2019

Conversation

coocood
Copy link
Member

@coocood coocood commented Dec 3, 2019

What problem does this PR solve?

Cherry-pick #13865

What is changed and how it works?

Check List

Tests

  • Unit test

Release note

  • fix lockTTL too large if local time is behind pd timestamp.

@coocood
Copy link
Member Author

coocood commented Dec 3, 2019

@AndreMouche @sticnarf @youjiali1995 PTAL

youjiali1995
youjiali1995 approved these changes Dec 3, 2019
View reviewed changes
Copy link
Contributor

@youjiali1995 youjiali1995 left a comment

Choose a reason for hiding this comment

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

LGTM

@coocood coocood added the sig/transaction SIG:Transaction label Dec 3, 2019
AndreMouche
AndreMouche approved these changes Dec 3, 2019
View reviewed changes
Copy link
Contributor

@AndreMouche AndreMouche left a comment

Choose a reason for hiding this comment

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

LGTM

@sticnarf
Copy link
Contributor

sticnarf commented Dec 3, 2019

LGTM

@coocood
Copy link
Member Author

coocood commented Dec 3, 2019

/merge

@sre-bot sre-bot added the status/can-merge Indicates a PR has been approved by a committer. label Dec 3, 2019
@coocood coocood added the status/LGT3 The PR has already had 3 LGTM. label Dec 3, 2019
@sre-bot
Copy link
Contributor

sre-bot commented Dec 3, 2019

/run-all-tests

@sre-bot sre-bot merged commit 84e4386 into pingcap:release-3.0 Dec 3, 2019
@coocood coocood deleted the fix-elapse-3.0 branch March 9, 2020 03:02
@coocood coocood changed the title store/tikv: fix lockTTL too large if local time is behind timestamp store/tikv: fix lockTTL too large if local time is behind timestamp (#13865) Apr 9, 2020
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

@AndreMouche AndreMouche AndreMouche approved these changes

Assignees
No one assigned
Labels
sig/transaction SIG:Transaction status/can-merge Indicates a PR has been approved by a committer. status/LGT3 The PR has already had 3 LGTM. type/bugfix This PR fixes a bug.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@coocood @sticnarf @sre-bot @AndreMouche @youjiali1995