github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-07 12:11:43 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #77686 from tedyu/preempt-qty

Browse Source 
Break out of inner loop when newQuantity is negative in admissionRequirementList#subtract
This commit is contained in:
Kubernetes Prow Robot
2019-07-15 14:53:37 -07:00
committed by GitHub
parent 80537a9c5f 0ec1f85b47
commit 7c90f7d96c
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/kubelet/preemption/preemption.go
View File

@@ -191,10 +191,9 @@ func (a admissionRequirementList) distance(pod *v1.Pod) float64 {
dist := float64(0)
for _, req := range a {
remainingRequest := float64(req.quantity - resource.GetResourceRequest(pod, req.resourceName))
if remainingRequest < 0 {
remainingRequest = 0
if remainingRequest > 0 {
dist += math.Pow(remainingRequest/float64(req.quantity), 2)
}
dist += math.Pow(remainingRequest/float64(req.quantity), 2)
}
return dist
}
@@ -207,6 +206,9 @@ func (a admissionRequirementList) subtract(pods ...*v1.Pod) admissionRequirement
newQuantity := req.quantity
for _, pod := range pods {
newQuantity -= resource.GetResourceRequest(pod, req.resourceName)
if newQuantity <= 0 {
break
}
}
if newQuantity > 0 {
newList = append(newList, &admissionRequirement{