kubernetes
/
autoscaler
mirror of https://github.com/kubernetes/autoscaler.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use FitsAnyNode in binpacking 

This means that PreFilters are run once per pod in binpacking
instead of #pods*#nodes times. This makes a huge performance
difference in very large clusters.
This commit is contained in:
Maciek Pytel 2020-08-13 15:34:14 +02:00 committed by Marwan Ahmed
parent 42afc33d59
commit dadb68fb8b
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
cluster-autoscaler/estimator/binpacking_estimator.go
View File

@ -63,7 +63,7 @@ func (estimator *BinpackingNodeEstimator) Estimate(
podInfos := calculatePodScore(pods, nodeTemplate) podInfos := calculatePodScore(pods, nodeTemplate)
sort.Slice(podInfos, func(i, j int) bool { return podInfos[i].score > podInfos[j].score }) sort.Slice(podInfos, func(i, j int) bool { return podInfos[i].score > podInfos[j].score })
newNodeNames := make([]string, 0) newNodeNames := make(map[string]bool)
if err := estimator.clusterSnapshot.Fork(); err != nil { if err := estimator.clusterSnapshot.Fork(); err != nil {
klog.Errorf("Error while calling ClusterSnapshot.Fork; %v", err) klog.Errorf("Error while calling ClusterSnapshot.Fork; %v", err)
@ -80,16 +80,18 @@ func (estimator *BinpackingNodeEstimator) Estimate(
for _, podInfo := range podInfos { for _, podInfo := range podInfos {
found := false found := false
for _, nodeName := range newNodeNames {
if err := estimator.predicateChecker.CheckPredicates(estimator.clusterSnapshot, podInfo.pod, nodeName); err == nil { nodeName, err := estimator.predicateChecker.FitsAnyNodeMatching(estimator.clusterSnapshot, podInfo.pod, func(nodeInfo *schedulerframework.NodeInfo) bool {
found = true return newNodeNames[nodeInfo.Node().Name]
if err := estimator.clusterSnapshot.AddPod(podInfo.pod, nodeName); err != nil { })
klog.Errorf("Error adding pod %v.%v to node %v in ClusterSnapshot; %v", podInfo.pod.Namespace, podInfo.pod.Name, nodeName, err) if err == nil {
return 0 found = true
} if err := estimator.clusterSnapshot.AddPod(podInfo.pod, nodeName); err != nil {
break klog.Errorf("Error adding pod %v.%v to node %v in ClusterSnapshot; %v", podInfo.pod.Namespace, podInfo.pod.Name, nodeName, err)
return 0
} }
} }
if !found { if !found {
// Add new node // Add new node
newNodeName, err := estimator.addNewNodeToSnapshot(nodeTemplate, newNodeNameTimestamp, newNodeNameIndex) newNodeName, err := estimator.addNewNodeToSnapshot(nodeTemplate, newNodeNameTimestamp, newNodeNameIndex)
@ -103,7 +105,7 @@ func (estimator *BinpackingNodeEstimator) Estimate(
klog.Errorf("Error adding pod %v.%v to node %v in ClusterSnapshot; %v", podInfo.pod.Namespace, podInfo.pod.Name, newNodeName, err) klog.Errorf("Error adding pod %v.%v to node %v in ClusterSnapshot; %v", podInfo.pod.Namespace, podInfo.pod.Name, newNodeName, err)
return 0 return 0
} }
newNodeNames = append(newNodeNames, newNodeName) newNodeNames[newNodeName] = true
} }
} }
return len(newNodeNames) return len(newNodeNames)