Repository navigation
fix: patch the Workload for a location restart - #642
Merged
Merged
Conversation
A location restart replaced the whole Workload it had read earlier, so any concurrent edit made the command fail with a conflict. It now sends a merge patch of the one annotation, which applies cleanly over other changes. Key changes: - patch only the location restart annotation instead of updating the Workload - document that the annotation stays after the restart and that removing it rolls the location once more - test a restart that races another edit, and an annotation naming a location the workload does not place in
kevwilliams
approved these changes
Nov 11, 2026
kevwilliams
left a comment
Contributor
There was a problem hiding this comment.
Verified MergeFrom without optimistic lock sends only the annotation with no resourceVersion, and the concurrent-edit test fails against a full Update.
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.
Requested by Scot Schuchert-Wells · project thread
This follows up on the review of #641. A location restart replaced the whole Workload it had read, so if someone else edited the Workload at the same moment, the command failed with a conflict. It now patches only its own annotation, so it applies cleanly on top of other edits. It also documents how the annotation behaves after a restart, and adds tests for the cases the review pointed out.
Changes
Test plan
make testand golangci-lint passGenerated by Claude Code