Repository navigation
Give resource lock acquisitions unique identities - #636
Merged
Merged
Conversation
Controller names were reused as Lease holder identities. With concurrent reconciles, a second reconcile from the same controller matched the existing identity and entered the protected section. It could then stop the first reconcile's renewal or release its lock. Build each locker ID from the acquiring object's kind, namespace, and name, followed by a UUID unique to the acquisition. Return a release function bound to that ID so callers cannot reconstruct ownership, and key renewal cancellation by the same ID. Guard Lease deletion with UID and resource-version preconditions to stop a stale release from deleting a Lease changed by a newer acquisition. Migrate all locking controllers and replace the old reentrant-lock test with a concurrent-acquisition regression test. Signed-off-by: Felix Kästner <felix.kaestner@sap.com>
felix-kaestner
enabled auto-merge (rebase)
October 13, 2026 16:53
felix-kaestner
force-pushed
the
fix/resourcelock
branch
from
October 13, 2026 16:53
da54720 to
7303baa
Compare
felix-kaestner
commented
Oct 13, 2026
Merging this branch changes the coverage (1 decrease, 5 increase)
Coverage detailsCompared to commit 711ee21 (run #38413362351)
Please note that the "Total", "Covered", and "Missed" counts above refer to code statements instead of lines of code. The value in brackets refers to the test coverage of that file in the old version of the code. Changed unit test files:
|
swagner-de
approved these changes
Oct 14, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Controller names were reused as Lease holder identities. With concurrent reconciles, a second reconcile from the same controller matched the existing identity and entered the protected section. It could then stop the first reconcile's renewal or release its lock.
Build each locker ID from the acquiring object's kind, namespace, and name, followed by a UUID unique to the acquisition. Return a release function bound to that ID so callers cannot reconstruct ownership, and key renewal cancellation by the same ID.
Guard Lease deletion with UID and resource-version preconditions to stop a stale release from deleting a Lease changed by a newer acquisition. Migrate all locking controllers and replace the old reentrant-lock test with a concurrent-acquisition regression test.