Skip to content

fix(device): use HasPrefix and TrimPrefix in DelQuota #2272

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

Merged
hami-robot merged 1 commit into from
Aug 3, 2026
Merged

fix(device): use HasPrefix and TrimPrefix in DelQuota #2272

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions pkg/device/quota.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,10 +228,10 @@ func (q *QuotaManager) DelQuota(quota *corev1.ResourceQuota) {
for idx, val := range quota.Spec.Hard {
value, ok := val.AsInt64()
if ok {
if len(idx.String()) <= len("limits.") {
if !strings.HasPrefix(idx.String(), "limits.") {
continue
}
dn := idx.String()[len("limits."):]
dn := strings.TrimPrefix(idx.String(), "limits.")
Comment thread
SK8-infi marked this conversation as resolved.
if !IsManagedQuota(dn) {
continue
}
Expand Down
30 changes: 30 additions & 0 deletions pkg/device/quota_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,3 +252,33 @@ func TestAddQuotaAndDelQuota(t *testing.T) {
t.Errorf("DelQuota: expected core limit 0, got %d", (*qm.Quotas[ns])[coreName].Limit)
}
}

func TestDelQuotaNonLimitsKey(t *testing.T) {
initTest()
qm := NewQuotaManager()
ns := "testns"
memName := "nvidia.com/gpumem"
coreName := "nvidia.com/gpucore"

rq := &corev1.ResourceQuota{}
rq.Namespace = ns
rq.Spec.Hard = corev1.ResourceList{
corev1.ResourceName("limits." + memName): *resource.NewQuantity(100, resource.DecimalSI),
corev1.ResourceName("limits." + coreName): *resource.NewQuantity(10, resource.DecimalSI),
}
qm.AddQuota(rq)

// Quota with non-limits keys (including 7-character prefix key).
unrelatedQuota := &corev1.ResourceQuota{}
unrelatedQuota.Namespace = ns
unrelatedQuota.Spec.Hard = corev1.ResourceList{
corev1.ResourceName("requests." + memName): *resource.NewQuantity(50, resource.DecimalSI),
corev1.ResourceName("0123456" + memName): *resource.NewQuantity(50, resource.DecimalSI),
}

// DelQuota on non-limits keys should NOT reset active quota limits.
qm.DelQuota(unrelatedQuota)
if (*qm.Quotas[ns])[memName].Limit != 100 {
t.Errorf("DelQuota: expected memory limit 100 after deleting non-limits quota, got %d", (*qm.Quotas[ns])[memName].Limit)
}
}
Loading