scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-04 04:08:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve overlapping quota behavior when there is a resource conflict

Browse Source
This commit is contained in:
derekwaynecarr
2016-02-22 14:24:54 -05:00
parent 3cf7776b50
commit 95df07aa9d
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
plugin/pkg/admission/resourcequota/admission.go
View File

@@ -208,7 +208,7 @@ func (q *quotaAdmission) Admit(a admission.Attributes) (err error) {
// check that we pass all remaining quotas so we do not prematurely charge // check that we pass all remaining quotas so we do not prematurely charge
// for each quota, mask the usage to the set of resources tracked by the quota // for each quota, mask the usage to the set of resources tracked by the quota
// if request + used < hard, return an error describing the failure // if request + used > hard, return an error describing the failure
updatedUsage := map[string]api.ResourceList{} updatedUsage := map[string]api.ResourceList{}
for _, resourceQuota := range resourceQuotasToProcess { for _, resourceQuota := range resourceQuotasToProcess {
hardResources := quota.ResourceNames(resourceQuota.Status.Hard) hardResources := quota.ResourceNames(resourceQuota.Status.Hard)
@@ -230,7 +230,7 @@ func (q *quotaAdmission) Admit(a admission.Attributes) (err error) {
// update the status for each quota with its new usage // update the status for each quota with its new usage
// if we get a conflict, get updated quota, and enqueue // if we get a conflict, get updated quota, and enqueue
for _, resourceQuota := range resourceQuotasToProcess { for i, resourceQuota := range resourceQuotasToProcess {
newUsage := updatedUsage[resourceQuota.Name] newUsage := updatedUsage[resourceQuota.Name]
quotaToUpdate := &api.ResourceQuota{ quotaToUpdate := &api.ResourceQuota{
ObjectMeta: api.ObjectMeta{ ObjectMeta: api.ObjectMeta{
@@ -248,11 +248,15 @@ func (q *quotaAdmission) Admit(a admission.Attributes) (err error) {
if !errors.IsConflict(err) { if !errors.IsConflict(err) {
return admission.NewForbidden(a, fmt.Errorf("Unable to update quota status: %s %v", resourceQuota.Name, err)) return admission.NewForbidden(a, fmt.Errorf("Unable to update quota status: %s %v", resourceQuota.Name, err))
} }
latestQuota, err := q.client.Core().ResourceQuotas(namespace).Get(resourceQuota.Name) // if we get a conflict, we get the latest copy of the quota documents that were not yet modified so we retry all with latest state.
if err != nil { for fetchIndex := i; fetchIndex < len(resourceQuotasToProcess); fetchIndex++ {
return admission.NewForbidden(a, fmt.Errorf("Unable to get quota: %s %v", resourceQuota.Name, err)) latestQuota, err := q.client.Core().ResourceQuotas(namespace).Get(resourceQuotasToProcess[fetchIndex].Name)
if err != nil {
return admission.NewForbidden(a, fmt.Errorf("Unable to get quota: %s %v", resourceQuotasToProcess[fetchIndex].Name, err))
}
tryAgain = append(tryAgain, latestQuota)
} }
tryAgain = append(tryAgain, latestQuota) break
} }
} }