Skip to content

Fix the problem that ttlManager may stop working if no need to lock after retry aggressive locking #1522

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
Merged
ti-chi-bot merged 4 commits into from
Dec 17, 2024
Merged

Fix the problem that ttlManager may stop working if no need to lock after retry aggressive locking #1522

ti-chi-bot merged 4 commits into from
Dec 17, 2024

Conversation

@MyonKeminta
Copy link
Contributor

@MyonKeminta MyonKeminta commented Dec 16, 2024

@MyonKeminta
Fix the problem that ttlManager may stop working if no need to lock a…
566c63d 
…fter retry aggressive locking

Signed-off-by: MyonKeminta <MyonKeminta@users.noreply.github.com>
@ti-chi-bot ti-chi-bot bot added dco-signoff: yes Indicates the PR's author has signed the dco. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Dec 16, 2024
@MyonKeminta MyonKeminta marked this pull request as draft December 16, 2024 08:26
@ti-chi-bot ti-chi-bot bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Dec 16, 2024
@MyonKeminta
Fix incorrect implementation
eb114cb 
Signed-off-by: MyonKeminta <MyonKeminta@users.noreply.github.com>
@MyonKeminta
Add more tests; fix a potential leak
26a7805 
Signed-off-by: MyonKeminta <MyonKeminta@users.noreply.github.com>
@MyonKeminta MyonKeminta marked this pull request as ready for review December 16, 2024 11:11
@ti-chi-bot ti-chi-bot bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Dec 16, 2024
cfzjywxk
cfzjywxk reviewed Dec 16, 2024
View reviewed changes
ekexium
ekexium approved these changes Dec 17, 2024
View reviewed changes
txnkv/transaction/txn.go Outdated
// acquirePessimisticLock requests, it will call ttlManager.run() again, but it's reentrant and will do nothing
// as the ttlManager is already running.
// * If the primary key is changed, the ttlManager will need to run on the new primary key instead. Reset it.
if !noNewLockToAcquire && !bytes.Equal(txn.aggressiveLockingContext.primaryKey, txn.aggressiveLockingContext.lastPrimaryKey) {
Copy link
Contributor

@ekexium ekexium Dec 17, 2024

Choose a reason for hiding this comment

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

Maybe replacing !noNewLockToAcquire with hasNewLockToAcquire is more idiomatic and makes the code more readable

Copy link
Contributor Author

@MyonKeminta MyonKeminta Dec 17, 2024

Choose a reason for hiding this comment

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

emmmm, ok

@ti-chi-bot ti-chi-bot bot added needs-1-more-lgtm Indicates a PR needs 1 more LGTM. approved labels Dec 17, 2024
@MyonKeminta
Address comment
56a0743 
Signed-off-by: MyonKeminta <MyonKeminta@users.noreply.github.com>
cfzjywxk
cfzjywxk approved these changes Dec 17, 2024
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 bot added lgtm and removed needs-1-more-lgtm Indicates a PR needs 1 more LGTM. labels Dec 17, 2024
@ti-chi-bot
Copy link

ti-chi-bot bot commented Dec 17, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: cfzjywxk, ekexium

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@ti-chi-bot
Copy link

ti-chi-bot bot commented Dec 17, 2024

[LGTM Timeline notifier]

Timeline:

  • 2024-12-17 07:57:05.433937389 +0000 UTC m=+943615.522739917: ☑️ agreed by ekexium.
  • 2024-12-17 09:11:54.483845014 +0000 UTC m=+948104.572647556: ☑️ agreed by cfzjywxk.

@ti-chi-bot ti-chi-bot bot merged commit 8e0275c into tikv:master Dec 17, 2024
12 checks passed
@MyonKeminta MyonKeminta deleted the m/fair-locking-ttlmanager-fix branch December 20, 2024 02:03
@MyonKeminta
Copy link
Contributor Author

MyonKeminta commented Aug 25, 2025

/cherry-pick tidb-7.1
/cherry-pick tidb-7.5
/cherry-pick tidb-8.1
/cherry-pick tidb-8.5

@ti-chi-bot ti-chi-bot mentioned this pull request Aug 25, 2025
Open
@ti-chi-bot
Copy link
Member

ti-chi-bot commented Aug 25, 2025

@MyonKeminta: new pull request created to branch tidb-7.1: #1742.

Details

In response to this:

/cherry-pick tidb-7.1
/cherry-pick tidb-7.5
/cherry-pick tidb-8.1
/cherry-pick tidb-8.5

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.

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Aug 25, 2025

@MyonKeminta: new pull request created to branch tidb-7.5: #1743.

Details

In response to this:

/cherry-pick tidb-7.1
/cherry-pick tidb-7.5
/cherry-pick tidb-8.1
/cherry-pick tidb-8.5

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.

@ti-chi-bot ti-chi-bot mentioned this pull request Aug 25, 2025
Open
@ti-chi-bot
Copy link
Member

ti-chi-bot commented Aug 25, 2025

@MyonKeminta: new pull request created to branch tidb-8.1: #1744.

Details

In response to this:

/cherry-pick tidb-7.1
/cherry-pick tidb-7.5
/cherry-pick tidb-8.1
/cherry-pick tidb-8.5

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.

@ti-chi-bot ti-chi-bot mentioned this pull request Aug 25, 2025
Open
@ti-chi-bot
Copy link
Member

ti-chi-bot commented Aug 25, 2025

@MyonKeminta: new pull request created to branch tidb-8.5: #1745.

Details

In response to this:

/cherry-pick tidb-7.1
/cherry-pick tidb-7.5
/cherry-pick tidb-8.1
/cherry-pick tidb-8.5

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.

@ti-chi-bot ti-chi-bot mentioned this pull request Aug 25, 2025
Merged
ti-chi-bot bot pushed a commit that referenced this pull request Sep 22, 2025
@ti-chi-bot @MyonKeminta
Fix the problem that ttlManager may stop working if no need to lock a…
f6ce237 
…fter retry aggressive locking (#1522) (#1745)

 

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

Co-authored-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

Reviewers

@cfzjywxk cfzjywxk cfzjywxk approved these changes

@ekexium ekexium ekexium approved these changes

Assignees

No one assigned

Labels

approved dco-signoff: yes Indicates the PR's author has signed the dco. lgtm size/L Denotes a PR that changes 100-499 lines, ignoring generated files.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@MyonKeminta @ti-chi-bot @cfzjywxk @ekexium