feat: cleanup candidate reservations when confirming vm - #871
Merged
juliusclausnitzer merged 7 commits intoJun 2, 2026
Conversation
|
No actionable comments were generated in the recent review. 🎉 ℹ️ Recent review info⚙️ Run configurationConfiguration used: Path: .coderabbit.yaml Review profile: CHILL Plan: Pro Run ID: 📒 Files selected for processing (2)
🚧 Files skipped from review as they are similar to previous changes (2)
📝 WalkthroughWalkthroughThe PR adds a Reservation field index keyed by allocation VM UUIDs, updates the controller to remove newly confirmed VM UUIDs from candidate reservations using that index, registers the index in test environments, and adds tests validating cleanup behavior. ChangesReservation Allocation Cleanup by VM UUID
Sequence Diagram(s)sequenceDiagram
participant Reconciler as reconcileAllocations
participant Status as Status.Allocations snapshot
participant Cleanup as cleanupCandidateReservations
participant Index as Reservation VM-UUID Index
participant Candidate as Candidate Reservation CRs
Reconciler->>Status: snapshot old allocations
Reconciler->>Reconciler: compute newStatusAllocations
Reconciler->>Cleanup: for each newly confirmed VM UUID
Cleanup->>Index: list reservations by VM UUID
Index-->>Cleanup: candidate reservations
Cleanup->>Candidate: patch Spec.CommittedResourceReservation.Allocations (remove VM UUID)
Candidate-->>Cleanup: patch result
Estimated code review effort🎯 4 (Complex) | ⏱️ ~45 minutes Possibly related PRs
Suggested reviewers
Poem
🚥 Pre-merge checks | ✅ 3 | ❌ 2❌ Failed checks (1 warning, 1 inconclusive)
✅ Passed checks (3 passed)
✏️ Tip: You can configure your own custom pre-merge checks in the settings. ✨ Finishing Touches📝 Generate docstrings
🧪 Generate unit tests (beta)
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
juliusclausnitzer
marked this pull request as ready for review
May 21, 2026 11:29
juliusclausnitzer
requested review from
PhilippMatthes,
SoWieMarkus,
auhlig,
mblos and
umswmayj
as code owners
May 21, 2026 11:29
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
There was a problem hiding this comment.
Actionable comments posted: 1
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
Inline comments:
In `@internal/scheduling/reservations/commitments/reservation_controller.go`:
- Around line 398-403: The current logic copies
res.Status.CommittedResourceReservation.Allocations into
existingStatusAllocations and later uses presence in status to skip cleanup,
which allows a transient cleanup failure to be permanently skipped on the next
reconcile; change the reconcile/cleanup flow in reservation_controller.go so
cleanup of stale candidate allocations is not gated solely by membership in
res.Status.CommittedResourceReservation.Allocations: compare
existingStatusAllocations to the new patched allocations and only mark candidate
allocations removed when the cleanup step actually succeeded, and if the
patch/cleanup fails do not mutate status to record the VM as cleaned;
specifically update the code that reads/writes
res.Status.CommittedResourceReservation.Allocations and the cleanup branch (the
blocks around existingStatusAllocations and the cleanup calls referenced in your
comment) to always retry cleanup for VMs whose candidate allocations remain
stale until cleanup returns success (or add an explicit per-VM cleanup-needed
flag/finalizer in status that you clear only after successful cleanup).
🪄 Autofix (Beta)
Fix all unresolved CodeRabbit comments on this PR:
- Push a commit to this branch (recommended)
- Create a new PR with the fixes
ℹ️ Review info
⚙️ Run configuration
Configuration used: Path: .coderabbit.yaml
Review profile: CHILL
Plan: Pro
Run ID: 8d9d8ac7-752f-4ae0-bbfc-99d65b9ce8b2
📒 Files selected for processing (5)
internal/scheduling/reservations/commitments/committed_resource_controller_test.gointernal/scheduling/reservations/commitments/field_index.gointernal/scheduling/reservations/commitments/integration_test.gointernal/scheduling/reservations/commitments/reservation_controller.gointernal/scheduling/reservations/commitments/reservation_controller_test.go
Contributor
Test Coverage ReportTest Coverage 📊: 69.5% |
juliusclausnitzer
deleted the
wm-cleanup-candidate-reservations-on-vm-confirm
branch
June 2, 2026 13:26
This was referenced Jun 8, 2026
PhilippMatthes
pushed a commit
that referenced
this pull request
Jun 8, 2026
PR #871 added proactive candidate reservation cleanup when a VM is confirmed on a reservation. When a VM transitions from Spec-only to Spec+Status (newly confirmed on the expected host), the controller immediately removes that VM's UUID from Spec.Allocations on all other candidate reservations. This frees phantom capacity blocks on non-selected hosts immediately rather than waiting for each candidate's grace period expiry or periodic requeue. This behavior was undocumented. Assisted-by: Claude Code:claude-sonnet-4-20250514 [Bash] [Read] Co-authored-by: cortex-ai-agents[bot] <279748396+cortex-ai-agents[bot]@users.noreply.github.com>
PhilippMatthes
added a commit
that referenced
this pull request
Jun 8, 2026
## 2026-06-08 — [#919](#919) ### cortex v0.1.0 (sha-a0373875) Breaking changes: - `Client.AddRemote()` signature changed — added `insecureSkipTLSVerify bool` parameter between `caCert` and `labels`. Any external caller of `pkg/multicluster.Client.AddRemote` must update their call site. ([#911](#911)) Non-breaking changes: - Cleanup candidate reservations when confirming VM ([#871](#871)) - Add `InsecureSkipTLSVerify` option to multicluster `RemoteConfig` ([#911](#911)) - Add KVM HANA stacking KPI ([#905](#905)) - Preserve input weight ordering when no weighers are configured ([#918](#918)) - Make nova alerts region- and value-aware ([#902](#902)) - Update cpu steal time query ([#904](#904)) - Bump datasource parallel reconciles to 3 to reduce queue lag ([#907](#907)) - Move `prometheusDatasourceControllerParallelReconciles` value from secrets to bundle ([#912](#912)) - Update `github.com/sapcc/go-bits` ([#903](#903), [#913](#913), [#915](#915)) - Update External dependencies ([#908](#908), [#910](#910), [#914](#914)) - Update kube-prometheus-stack Docker tag to v86 ([#895](#895)) ### cortex-crds v0.0.74 Includes updated chart cortex v0.1.0. ### cortex-nova v0.0.74 Includes updated chart cortex v0.1.0. ### cortex-cinder v0.0.74 Includes updated chart cortex v0.1.0. ### cortex-pods v0.0.74 Includes updated chart cortex v0.1.0. ### cortex-ironcore v0.0.74 Includes updated chart cortex v0.1.0. ### cortex-manila v0.0.74 Includes updated chart cortex v0.1.0. --- **Related PRs:** - Bump PR: [#920](#920) - Changelog PR: [#921](#921)
mblos
pushed a commit
that referenced
this pull request
Jun 16, 2026
PR #871 added proactive candidate reservation cleanup when a VM is confirmed on a reservation. When a VM transitions from Spec-only to Spec+Status (newly confirmed on the expected host), the controller immediately removes that VM's UUID from Spec.Allocations on all other candidate reservations. This frees phantom capacity blocks on non-selected hosts immediately rather than waiting for each candidate's grace period expiry or periodic requeue. This behavior was undocumented. Assisted-by: Claude Code:claude-sonnet-4-20250514 [Bash] [Read] Co-authored-by: cortex-ai-agents[bot] <279748396+cortex-ai-agents[bot]@users.noreply.github.com>
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
1 participant
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.
When a VM is confirmed onto a CommittedResource reservation, immediately
remove that VM's UUID from Spec.Allocations on all other candidate
reservations that still carry it. Previously those slots were only freed
after their grace period or the next periodic requeue, leaving transient
phantom blocks on non-selected hosts.