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

Using only pods within the namespace for spreading logic

Browse Source
This commit is contained in:
Abhishek Gupta 2015-03-06 14:29:44 -08:00
parent b71fc76ec4
commit 5ce4558955
2 changed files with 29 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/scheduler/predicates.go
View File

@ -264,9 +264,16 @@ func (s *ServiceAffinity) CheckServiceAffinity(pod api.Pod, existingPods []api.P
if err != nil { if err != nil {
return false, err return false, err
} }
if len(servicePods) > 0 { // consider only the pods that belong to the same namespace
nsServicePods := []api.Pod{}
for _, nsPod := range servicePods {
if nsPod.Namespace == pod.Namespace {
nsServicePods = append(nsServicePods, nsPod)
}
}
if len(nsServicePods) > 0 {
// consider any service pod and fetch the minion its hosted on // consider any service pod and fetch the minion its hosted on
otherMinion, err := s.nodeInfo.GetNodeInfo(servicePods[0].Status.Host) otherMinion, err := s.nodeInfo.GetNodeInfo(nsServicePods[0].Status.Host)
if err != nil { if err != nil {
return false, err return false, err
} }

29
pkg/scheduler/spreading.go
View File

@ -36,18 +36,23 @@ func NewServiceSpreadPriority(serviceLister ServiceLister) PriorityFunction {
// on the same machine. // on the same machine.
func (s *ServiceSpread) CalculateSpreadPriority(pod api.Pod, podLister PodLister, minionLister MinionLister) (HostPriorityList, error) { func (s *ServiceSpread) CalculateSpreadPriority(pod api.Pod, podLister PodLister, minionLister MinionLister) (HostPriorityList, error) {
var maxCount int var maxCount int
var pods []api.Pod var nsServicePods []api.Pod
var err error
services, err := s.serviceLister.GetPodServices(pod) services, err := s.serviceLister.GetPodServices(pod)
if err == nil { if err == nil {
// just use the first service and get the other pods within the service // just use the first service and get the other pods within the service
// TODO: a separate predicate can be created that tries to handle all services for the pod // TODO: a separate predicate can be created that tries to handle all services for the pod
selector := labels.SelectorFromSet(services[0].Spec.Selector) selector := labels.SelectorFromSet(services[0].Spec.Selector)
pods, err = podLister.List(selector) pods, err := podLister.List(selector)
if err != nil { if err != nil {
return nil, err return nil, err
} }
// consider only the pods that belong to the same namespace
for _, nsPod := range pods {
if nsPod.Namespace == pod.Namespace {
nsServicePods = append(nsServicePods, nsPod)
}
}
} }
minions, err := minionLister.List() minions, err := minionLister.List()
@ -56,8 +61,8 @@ func (s *ServiceSpread) CalculateSpreadPriority(pod api.Pod, podLister PodLister
} }
counts := map[string]int{} counts := map[string]int{}
if len(pods) > 0 { if len(nsServicePods) > 0 {
for _, pod := range pods { for _, pod := range nsServicePods {
counts[pod.Status.Host]++ counts[pod.Status.Host]++
// Compute the maximum number of pods hosted on any minion // Compute the maximum number of pods hosted on any minion
if counts[pod.Status.Host] > maxCount { if counts[pod.Status.Host] > maxCount {
@ -97,17 +102,23 @@ func NewServiceAntiAffinityPriority(serviceLister ServiceLister, label string) P
// on machines with the same value for a particular label. // on machines with the same value for a particular label.
// The label to be considered is provided to the struct (ServiceAntiAffinity). // The label to be considered is provided to the struct (ServiceAntiAffinity).
func (s *ServiceAntiAffinity) CalculateAntiAffinityPriority(pod api.Pod, podLister PodLister, minionLister MinionLister) (HostPriorityList, error) { func (s *ServiceAntiAffinity) CalculateAntiAffinityPriority(pod api.Pod, podLister PodLister, minionLister MinionLister) (HostPriorityList, error) {
var pods []api.Pod var nsServicePods []api.Pod
services, err := s.serviceLister.GetPodServices(pod) services, err := s.serviceLister.GetPodServices(pod)
if err == nil { if err == nil {
// just use the first service and get the other pods within the service // just use the first service and get the other pods within the service
// TODO: a separate predicate can be created that tries to handle all services for the pod // TODO: a separate predicate can be created that tries to handle all services for the pod
selector := labels.SelectorFromSet(services[0].Spec.Selector) selector := labels.SelectorFromSet(services[0].Spec.Selector)
pods, err = podLister.List(selector) pods, err := podLister.List(selector)
if err != nil { if err != nil {
return nil, err return nil, err
} }
// consider only the pods that belong to the same namespace
for _, nsPod := range pods {
if nsPod.Namespace == pod.Namespace {
nsServicePods = append(nsServicePods, nsPod)
}
}
} }
minions, err := minionLister.List() minions, err := minionLister.List()
@ -128,7 +139,7 @@ func (s *ServiceAntiAffinity) CalculateAntiAffinityPriority(pod api.Pod, podList
} }
podCounts := map[string]int{} podCounts := map[string]int{}
for _, pod := range pods { for _, pod := range nsServicePods {
label, exists := labeledMinions[pod.Status.Host] label, exists := labeledMinions[pod.Status.Host]
if !exists { if !exists {
continue continue
@ -136,7 +147,7 @@ func (s *ServiceAntiAffinity) CalculateAntiAffinityPriority(pod api.Pod, podList
podCounts[label]++ podCounts[label]++
} }
numServicePods := len(pods) numServicePods := len(nsServicePods)
result := []HostPriority{} result := []HostPriority{}
//score int - scale of 0-10 //score int - scale of 0-10
// 0 being the lowest priority and 10 being the highest // 0 being the lowest priority and 10 being the highest