|
@@ -234,8 +234,8 @@ func (g *genericScheduler) Schedule(pod *v1.Pod, nodeLister algorithm.NodeLister
|
|
|
}
|
|
|
|
|
|
metaPrioritiesInterface := g.priorityMetaProducer(pod, g.nodeInfoSnapshot.NodeInfoMap)
|
|
|
- //priorityList, err := PrioritizeNodes(pod, g.nodeInfoSnapshot.NodeInfoMap, metaPrioritiesInterface, g.prioritizers, filteredNodes, g.extenders)
|
|
|
- priorityList, err := CustomPrioritizeNodes(pod, g.nodeInfoSnapshot.NodeInfoMap, metaPrioritiesInterface, g.prioritizers, filteredNodes, g.extenders)
|
|
|
+ priorityList, err := PrioritizeNodes(pod, g.nodeInfoSnapshot.NodeInfoMap, metaPrioritiesInterface, g.prioritizers, filteredNodes, g.extenders)
|
|
|
+ //priorityList, err := CustomPrioritizeNodes(pod, g.nodeInfoSnapshot.NodeInfoMap, metaPrioritiesInterface, g.prioritizers, filteredNodes, g.extenders)
|
|
|
if err != nil {
|
|
|
return result, err
|
|
|
}
|
|
@@ -786,12 +786,12 @@ func PrioritizeNodes(
|
|
|
for i := range nodes {
|
|
|
result = append(result, schedulerapi.HostPriority{Host: nodes[i].Name, Score: 0})
|
|
|
for j := range priorityConfigs {
|
|
|
- result[i].Score += results[j][i].Score * priorityConfigs[j].Weight
|
|
|
+ result[i].Score += results[j][i].Score * float64(priorityConfigs[j].Weight)
|
|
|
}
|
|
|
}
|
|
|
|
|
|
if len(extenders) != 0 && nodes != nil {
|
|
|
- combinedScores := make(map[string]int, len(nodeNameToInfo))
|
|
|
+ combinedScores := make(map[string]float64, len(nodeNameToInfo))
|
|
|
for i := range extenders {
|
|
|
if !extenders[i].IsInterested(pod) {
|
|
|
continue
|
|
@@ -810,7 +810,7 @@ func PrioritizeNodes(
|
|
|
if klog.V(10) {
|
|
|
klog.Infof("%v -> %v: %v, Score: (%d)", util.GetPodFullName(pod), host, extenders[extIndex].Name(), score)
|
|
|
}
|
|
|
- combinedScores[host] += score * weight
|
|
|
+ combinedScores[host] += score * float64(weight)
|
|
|
}
|
|
|
mu.Unlock()
|
|
|
}(i)
|