github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-31 23:37:01 +00:00
Code Issues Projects Releases Wiki Activity

optimize pod affinity when predicate

Browse Source
This commit is contained in:
LouZhengwei 2016-12-11 23:49:45 +08:00
parent d8c925319a
commit 5c65088c18
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
plugin/pkg/scheduler/algorithm/predicates/predicates.go
View File

@ -1096,6 +1096,11 @@ func (c *PodAffinityChecker) satisfiesPodsAffinityAntiAffinity(pod *v1.Pod, node
// If the requirement matches a pod's own labels are namespace, and there are // If the requirement matches a pod's own labels are namespace, and there are
// no other such pods, then disregard the requirement. This is necessary to // no other such pods, then disregard the requirement. This is necessary to
// not block forever because the first pod of the collection can't be scheduled. // not block forever because the first pod of the collection can't be scheduled.
if matchingPodExists {
glog.V(10).Infof("Cannot schedule pod %+v onto node %v,because of PodAffinityTerm %v, err: %v",
podName(pod), node.Name, term, err)
return false
}
namespaces := priorityutil.GetNamespacesFromPodAffinityTerm(pod, &term) namespaces := priorityutil.GetNamespacesFromPodAffinityTerm(pod, &term)
selector, err := metav1.LabelSelectorAsSelector(term.LabelSelector) selector, err := metav1.LabelSelectorAsSelector(term.LabelSelector)
if err != nil { if err != nil {
@ -1104,7 +1109,7 @@ func (c *PodAffinityChecker) satisfiesPodsAffinityAntiAffinity(pod *v1.Pod, node
return false return false
} }
match := priorityutil.PodMatchesTermsNamespaceAndSelector(pod, namespaces, selector) match := priorityutil.PodMatchesTermsNamespaceAndSelector(pod, namespaces, selector)
if !match || matchingPodExists { if !match {
glog.V(10).Infof("Cannot schedule pod %+v onto node %v,because of PodAffinityTerm %v, err: %v", glog.V(10).Infof("Cannot schedule pod %+v onto node %v,because of PodAffinityTerm %v, err: %v",
podName(pod), node.Name, term, err) podName(pod), node.Name, term, err)
return false return false