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

lazy/dynamic initilization on the int64 pointers of inter-podaffinity priority

Browse Source
This commit is contained in:
Wei Huang 2019-04-23 16:19:19 -07:00
parent 854a266e94
commit 492b970d73
No known key found for this signature in database
GPG Key ID: BE5E9752F8B6E005
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/scheduler/algorithm/priorities/interpod_affinity.go
View File

@ -122,10 +122,14 @@ func (ipa *InterPodAffinity) CalculateInterPodAffinityPriority(pod *v1.Pod, node
// the node. // the node.
pm := newPodAffinityPriorityMap(nodes) pm := newPodAffinityPriorityMap(nodes)
allNodeNames := make([]string, 0, len(nodeNameToInfo)) allNodeNames := make([]string, 0, len(nodeNameToInfo))
lazyInit := hasAffinityConstraints || hasAntiAffinityConstraints
for name := range nodeNameToInfo { for name := range nodeNameToInfo {
allNodeNames = append(allNodeNames, name) allNodeNames = append(allNodeNames, name)
// if pod has affinity defined, or target node has affinityPods
if lazyInit || len(nodeNameToInfo[name].PodsWithAffinity()) != 0 {
pm.counts[name] = new(int64) pm.counts[name] = new(int64)
} }
}
// convert the topology key based weights to the node name based weights // convert the topology key based weights to the node name based weights
var maxCount, minCount int64 var maxCount, minCount int64
@ -191,7 +195,7 @@ func (ipa *InterPodAffinity) CalculateInterPodAffinityPriority(pod *v1.Pod, node
nodeInfo := nodeNameToInfo[allNodeNames[i]] nodeInfo := nodeNameToInfo[allNodeNames[i]]
if nodeInfo.Node() != nil { if nodeInfo.Node() != nil {
if hasAffinityConstraints || hasAntiAffinityConstraints { if hasAffinityConstraints || hasAntiAffinityConstraints {
// We need to process all the nodes. // We need to process all the pods.
for _, existingPod := range nodeInfo.Pods() { for _, existingPod := range nodeInfo.Pods() {
if err := processPod(existingPod); err != nil { if err := processPod(existingPod); err != nil {
pm.setError(err) pm.setError(err)
@ -214,6 +218,9 @@ func (ipa *InterPodAffinity) CalculateInterPodAffinityPriority(pod *v1.Pod, node
} }
for _, node := range nodes { for _, node := range nodes {
if pm.counts[node.Name] == nil {
continue
}
if *pm.counts[node.Name] > maxCount { if *pm.counts[node.Name] > maxCount {
maxCount = *pm.counts[node.Name] maxCount = *pm.counts[node.Name]
} }
@ -224,9 +231,10 @@ func (ipa *InterPodAffinity) CalculateInterPodAffinityPriority(pod *v1.Pod, node
// calculate final priority score for each node // calculate final priority score for each node
result := make(schedulerapi.HostPriorityList, 0, len(nodes)) result := make(schedulerapi.HostPriorityList, 0, len(nodes))
maxMinDiff := maxCount - minCount
for _, node := range nodes { for _, node := range nodes {
fScore := float64(0) fScore := float64(0)
if (maxCount - minCount) > 0 { if maxMinDiff > 0 && pm.counts[node.Name] != nil {
fScore = float64(schedulerapi.MaxPriority) * (float64(*pm.counts[node.Name]-minCount) / float64(maxCount-minCount)) fScore = float64(schedulerapi.MaxPriority) * (float64(*pm.counts[node.Name]-minCount) / float64(maxCount-minCount))
} }
result = append(result, schedulerapi.HostPriority{Host: node.Name, Score: int(fScore)}) result = append(result, schedulerapi.HostPriority{Host: node.Name, Score: int(fScore)})