Skip to content

fix: clamp ResourcePool available at zero and stop corrupting Hard #2024

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

Open
AruneshDwivedi wants to merge 4 commits into
base: main
Choose a base branch
from
Open

fix: clamp ResourcePool available at zero and stop corrupting Hard #2024

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dcac4b7
fix: clamp ResourcePool available at zero and stop corrupting Hard
Jul 12, 2026
d7cc990
Potential fix for pull request finding
oliverbaehler Jul 13, 2026
45c5ba7
fix: restore DeepCopy assignment dropped from CalculateAvailableResou…
AruneshDwivedi Jul 16, 2026
3b32adb
fix: clamp available claimable resources at zero
Jul 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions api/v1beta2/resourcepool_func.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,12 +159,22 @@ func (r *ResourcePool) CalculateAvailableResources() {
available := corev1.ResourceList{}

for res, qt := range r.Status.Allocation.Hard {
// Copy qt before subtracting: ranging over the map yields live
// references, so mutating it in place would corrupt Hard.
remaining := qt.DeepCopy()
Comment thread
oliverbaehler marked this conversation as resolved.
Outdated

amount, exists := r.Status.Allocation.Claimed[res]
if exists {
qt.Sub(amount)
remaining.Sub(amount)
Comment on lines 167 to +169
}

// A pool can never offer a negative amount of resources, so clamp
// at zero. This also keeps Hard intact for downstream math.
if remaining.Sign() < 0 {
remaining = resource.MustParse("0")
}
Comment thread
AruneshDwivedi marked this conversation as resolved.

available[res] = qt
available[res] = remaining
}

r.Status.Allocation.Available = available
Expand Down
38 changes: 38 additions & 0 deletions api/v1beta2/resourcepool_func_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,44 @@ func TestCalculateResources(t *testing.T) {
assert.Equal(t, 0, (&actualAvailable).Cmp(resource.MustParse("1")))
}

func TestCalculateResources_OverSubscriptionDoesNotGoNegative(t *testing.T) {
pool := &capsulev1beta2.ResourcePool{
Status: capsulev1beta2.ResourcePoolStatus{
Allocation: capsulev1beta2.ResourcePoolQuotaStatus{
Hard: corev1.ResourceList{
corev1.ResourceLimitsCPU: resource.MustParse("10"),
},
},
Claims: capsulev1beta2.ResourcePoolNamespaceClaimsStatus{
"ns": {
&capsulev1beta2.ResourcePoolClaimsItem{
Claims: corev1.ResourceList{
corev1.ResourceLimitsCPU: resource.MustParse("55"),
},
},
},
},
},
}

pool.CalculateClaimedResources()

// Even when claims exceed the hard limit, available must clamp at zero
// and Hard must stay intact (regression: subtracting in place corrupted
// both Hard and Available, producing negative values — see issue #1977).
actualAvailable := pool.Status.Allocation.Available[corev1.ResourceLimitsCPU]
assert.Equal(t, 0, (&actualAvailable).Cmp(resource.MustParse("0")))

actualHard := pool.Status.Allocation.Hard[corev1.ResourceLimitsCPU]
assert.Equal(t, 0, (&actualHard).Cmp(resource.MustParse("10")))

// With zero available, a new oversized claim must be rejected.
errs := pool.CanClaimFromPool(corev1.ResourceList{
corev1.ResourceLimitsCPU: resource.MustParse("55"),
})
assert.Len(t, errs, 1)
}

func TestCanClaimFromPool(t *testing.T) {
pool := &capsulev1beta2.ResourcePool{
Status: capsulev1beta2.ResourcePoolStatus{
Expand Down
Loading