Fix heartbeat self-conflict causes unnecessary lease release after transient timeout#3418
Merged
Merged
Conversation
Aaronontheweb
requested changes
Mar 18, 2026
| // Self-conflict: our previous PUT succeeded on the server but timed out | ||
| // on the client, so we retried with a stale version. The lease is still ours — | ||
| // update the version and continue heartbeating. | ||
| _log.Warning( |
Member
There was a problem hiding this comment.
resource.Value.Owner and _ownerName are always the same so we could clean this log message up and simplify it.
2 tasks
This was referenced May 21, 2026
This was referenced Jun 2, 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.
Summary
Left<>handler in theGrantedstate now checks whether the conflict owner matches the current node. Same owner: update the version and continue heartbeating. Different owner: release the lease (unchanged behavior).Changes
LeaseActor.cs(both Kubernetes and Azure): Added an owner equality check before the existing unconditional release in the heartbeat conflict handler. Usesstring.EqualswithStringComparison.Ordinalfor strict matching.LeaseActorSpec.cs(both Kubernetes and Azure): Added 3 reproduction tests per implementation:HeartbeatSelfConflictAfterTimeoutShouldStayGranted— timeout → retry → self-conflict → stays grantedHeartbeatSelfConflictShouldNotCallLeaseLostCallback— lease-lost callback must not fire on self-conflictHeartbeatConflictWithDifferentOwnerAfterTimeoutShouldRelease— guards that genuine conflicts still releaseTest plan