mirror of https://github.com/k3s-io/k3s
combine similar code where calucate schedule priority
parent
0ba00ec3a3
commit
7164967662
|
@ -653,28 +653,23 @@ func PrioritizeNodes(
|
||||||
|
|
||||||
results := make([]schedulerapi.HostPriorityList, len(priorityConfigs), len(priorityConfigs))
|
results := make([]schedulerapi.HostPriorityList, len(priorityConfigs), len(priorityConfigs))
|
||||||
|
|
||||||
for i, priorityConfig := range priorityConfigs {
|
for i := range priorityConfigs {
|
||||||
if priorityConfig.Function != nil {
|
|
||||||
// DEPRECATED
|
|
||||||
wg.Add(1)
|
|
||||||
go func(index int, config algorithm.PriorityConfig) {
|
|
||||||
defer wg.Done()
|
|
||||||
var err error
|
|
||||||
results[index], err = config.Function(pod, nodeNameToInfo, nodes)
|
|
||||||
if err != nil {
|
|
||||||
appendError(err)
|
|
||||||
}
|
|
||||||
}(i, priorityConfig)
|
|
||||||
} else {
|
|
||||||
results[i] = make(schedulerapi.HostPriorityList, len(nodes))
|
results[i] = make(schedulerapi.HostPriorityList, len(nodes))
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
processNode := func(index int) {
|
processNode := func(index int) {
|
||||||
nodeInfo := nodeNameToInfo[nodes[index].Name]
|
nodeInfo := nodeNameToInfo[nodes[index].Name]
|
||||||
var err error
|
var err error
|
||||||
for i := range priorityConfigs {
|
for i, priorityConfig := range priorityConfigs {
|
||||||
|
// DEPRECATED when ALL priorityConfigs have Map-Reduce pattern.
|
||||||
if priorityConfigs[i].Function != nil {
|
if priorityConfigs[i].Function != nil {
|
||||||
|
// Make sure that the old-style priority function only runs once.
|
||||||
|
if results[i][0].Host == "" {
|
||||||
|
results[i], err = priorityConfig.Function(pod, nodeNameToInfo, nodes)
|
||||||
|
if err != nil {
|
||||||
|
appendError(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
results[i][index], err = priorityConfigs[i].Map(pod, meta, nodeInfo)
|
results[i][index], err = priorityConfigs[i].Map(pod, meta, nodeInfo)
|
||||||
|
|
Loading…
Reference in New Issue