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

Cache pods with pod (anti)affinity constraints

Browse Source
This commit is contained in:
Wojciech Tyczynski 2016-07-22 12:37:21 +02:00
parent 03fe6b962c
commit a63cccfafc
1 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
plugin/pkg/scheduler/schedulercache/node_info.go
View File

@ -33,11 +33,13 @@ type NodeInfo struct {
// Overall node information. // Overall node information.
node *api.Node node *api.Node
pods []*api.Pod
podsWithAffinity []*api.Pod
// Total requested resource of all pods on this node. // Total requested resource of all pods on this node.
// It includes assumed pods which scheduler sends binding to apiserver but // It includes assumed pods which scheduler sends binding to apiserver but
// didn't get it as scheduled yet. // didn't get it as scheduled yet.
requestedResource *Resource requestedResource *Resource
pods []*api.Pod
nonzeroRequest *Resource nonzeroRequest *Resource
// We store allocatedResources (which is Node.Status.Allocatable.*) explicitly // We store allocatedResources (which is Node.Status.Allocatable.*) explicitly
// as int64, to avoid conversions and accessing map. // as int64, to avoid conversions and accessing map.
@ -126,13 +128,19 @@ func (n *NodeInfo) Clone() *NodeInfo {
pods := append([]*api.Pod(nil), n.pods...) pods := append([]*api.Pod(nil), n.pods...)
clone := &NodeInfo{ clone := &NodeInfo{
node: n.node, node: n.node,
pods: pods,
requestedResource: &(*n.requestedResource), requestedResource: &(*n.requestedResource),
nonzeroRequest: &(*n.nonzeroRequest), nonzeroRequest: &(*n.nonzeroRequest),
allocatableResource: &(*n.allocatableResource), allocatableResource: &(*n.allocatableResource),
allowedPodNumber: n.allowedPodNumber, allowedPodNumber: n.allowedPodNumber,
pods: pods,
generation: n.generation, generation: n.generation,
} }
if len(n.pods) > 0 {
clone.pods = append([]*api.Pod(nil), n.pods...)
}
if len(n.podsWithAffinity) > 0 {
clone.podsWithAffinity = append([]*api.Pod(nil), n.podsWithAffinity...)
}
return clone return clone
} }
@ -154,6 +162,10 @@ func (n *NodeInfo) addPod(pod *api.Pod) {
n.nonzeroRequest.MilliCPU += non0_cpu n.nonzeroRequest.MilliCPU += non0_cpu
n.nonzeroRequest.Memory += non0_mem n.nonzeroRequest.Memory += non0_mem
n.pods = append(n.pods, pod) n.pods = append(n.pods, pod)
// TODO: This should return pointer to avoid allocations.
if affinity, err := api.GetAffinityFromPodAnnotations(pod.Annotations); err == nil && (affinity.PodAffinity != nil || affinity.PodAntiAffinity != nil) {
n.podsWithAffinity = append(n.podsWithAffinity, pod)
}
n.generation++ n.generation++
} }
@ -164,6 +176,19 @@ func (n *NodeInfo) removePod(pod *api.Pod) error {
return err return err
} }
for i := range n.podsWithAffinity {
k2, err := getPodKey(n.podsWithAffinity[i])
if err != nil {
glog.Errorf("Cannot get pod key, err: %v", err)
continue
}
if k1 == k2 {
// delete the element
n.podsWithAffinity[i] = n.podsWithAffinity[len(n.podsWithAffinity)-1]
n.podsWithAffinity = n.podsWithAffinity[:len(n.podsWithAffinity)-1]
break
}
}
for i := range n.pods { for i := range n.pods {
k2, err := getPodKey(n.pods[i]) k2, err := getPodKey(n.pods[i])
if err != nil { if err != nil {