github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 17:30:00 +00:00
Code Issues Projects Releases Wiki Activity

Fix a preemption bug when pods are matched by pdb.Status.DisruptedPods

Browse Source
This commit is contained in:
Wei Huang 2020-06-24 09:37:15 -07:00
parent dc0122ca6a
commit 488621815f
No known key found for this signature in database
GPG Key ID: BE5E9752F8B6E005
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkg/scheduler/core/generic_scheduler.go
View File

@ -936,15 +936,14 @@ func filterPodsWithPDBViolation(pods []*v1.Pod, pdbs []*policy.PodDisruptionBudg
if selector.Empty() || !selector.Matches(labels.Set(pod.Labels)) { if selector.Empty() || !selector.Matches(labels.Set(pod.Labels)) {
continue continue
} }
// Only decrement the matched pdb when it's not in its <DisruptedPods>;
// otherwise we may over-decrement the budget number.
if _, exist := pdb.Status.DisruptedPods[pod.Name]; !exist {
pdbsAllowed[i]--
}
// We have found a matching PDB. // We have found a matching PDB.
if pdbsAllowed[i] <= 0 { if pdbsAllowed[i] < 0 {
pdbForPodIsViolated = true pdbForPodIsViolated = true
} else {
// Only decrement the matched pdb when it's not in its <DisruptedPods>;
// otherwise we may over-decrement the budget number.
if _, exist := pdb.Status.DisruptedPods[pod.Name]; !exist {
pdbsAllowed[i]--
}
} }
} }
} }