Add cache-aware placement affinity #2867
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,5 +2,6 @@ package placement | |
|
|
||
| const ( | ||
| maxRetries = 3 | ||
| maxExhaustedRetries = 100 | ||
| maxStartingInstancesPerNode = 3 | ||
| ) | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -36,7 +36,7 @@ func DefaultBestOfKConfig() BestOfKConfig { | |
| } | ||
|
|
||
| // Score calculates the placement score for this node | ||
| func (b *BestOfK) Score(node *nodemanager.Node, resources nodemanager.SandboxResources, config BestOfKConfig, affinityScores ...map[string]float64) float64 { | ||
| metrics := node.Metrics() | ||
|
|
||
| // Get locally recorded resources that haven't been reported yet. | ||
|
|
@@ -61,7 +61,12 @@ func (b *BestOfK) Score(node *nodemanager.Node, resources nodemanager.SandboxRes | |
|
|
||
| cpuRequested := float64(resources.CPUs) | ||
|
|
||
| score := (cpuRequested + float64(reserved) + config.Alpha*usageAvg) / totalCapacity | ||
| if len(affinityScores) > 0 { | ||
| score -= affinityScores[0][node.ID] | ||
| } | ||
|
ValentaTomas marked this conversation as resolved.
There was a problem hiding this comment. Affinity bonus not normalized by totalCapacity in ScoreMedium Severity The base placement score is divided by   Reviewed by Cursor Bugbot for commit b9916c4. Configure here. |
||
|
|
||
| return score | ||
| } | ||
|
|
||
| // CanFit checks if the node can fit a new VM with the given quota | ||
|
|
@@ -111,19 +116,40 @@ func (b *BestOfK) UpdateConfig(config BestOfKConfig) { | |
| } | ||
|
|
||
| // chooseNode selects the best node for placing a VM with the given quota | ||
| func (b *BestOfK) chooseNode(_ context.Context, nodes []*nodemanager.Node, excludedNodes map[string]struct{}, resources nodemanager.SandboxResources, buildMachineInfo machineinfo.MachineInfo, filterByLabels bool, requiredLabels []string, affinityScores ...map[string]float64) (bestNode *nodemanager.Node, err error) { | ||
| // Fix the config, we want to dynamically update it | ||
| config := b.getConfig() | ||
| var affinity map[string]float64 | ||
| if len(affinityScores) > 0 { | ||
| affinity = affinityScores[0] | ||
| } | ||
|
|
||
| // Filter eligible nodes | ||
| candidates := b.sample(nodes, config, excludedNodes, resources, buildMachineInfo, filterByLabels, requiredLabels) | ||
| if len(affinity) > 0 { | ||
| seen := make(map[string]struct{}, len(candidates)) | ||
| for _, n := range candidates { | ||
| seen[n.ID] = struct{}{} | ||
| } | ||
| for _, n := range nodes { | ||
| if affinity[n.ID] <= 0 { | ||
| continue | ||
| } | ||
| if _, ok := seen[n.ID]; ok { | ||
| continue | ||
| } | ||
| if b.isCandidate(n, config, excludedNodes, resources, buildMachineInfo, filterByLabels, requiredLabels) { | ||
|
ValentaTomas marked this conversation as resolved.
|
||
| candidates = append(candidates, n) | ||
| } | ||
| } | ||
| } | ||
|
cursor[bot] marked this conversation as resolved.
|
||
|
|
||
| // Find the best node among candidates | ||
| bestScore := math.MaxFloat64 | ||
|
|
||
| for _, node := range candidates { | ||
| // Calculate score | ||
| score := b.Score(node, resources, config, affinity) | ||
|
|
||
| if score < bestScore { | ||
| bestNode = node | ||
|
|
@@ -138,6 +164,34 @@ func (b *BestOfK) chooseNode(_ context.Context, nodes []*nodemanager.Node, exclu | |
| return bestNode, nil | ||
| } | ||
|
|
||
| func (b *BestOfK) isCandidate(node *nodemanager.Node, config BestOfKConfig, excludedNodes map[string]struct{}, resources nodemanager.SandboxResources, buildMachineInfo machineinfo.MachineInfo, filterByLabels bool, requiredLabels []string) bool { | ||
| if _, ok := excludedNodes[node.ID]; ok { | ||
| return false | ||
| } | ||
| // If the node is not ready, we don't want to schedule a new sandbox on it. | ||
| if node.Status() != api.NodeStatusReady { | ||
| return false | ||
| } | ||
| // If the node CPU doesn't match the requested machine, we skip it. | ||
| if !isNodeCPUCompatible(node, buildMachineInfo) { | ||
| return false | ||
| } | ||
| // If label filtering is enabled, the node has to match the team's required labels. | ||
| if filterByLabels && !isNodeLabelsCompatible(node, requiredLabels) { | ||
| return false | ||
| } | ||
| // If can-fit is enabled, the node must have enough capacity for the requested resources. | ||
| if config.CanFit && !b.CanFit(node, resources, config) { | ||
| return false | ||
| } | ||
| // Avoid placing on nodes that already have too many sandboxes starting. | ||
| if config.TooManyStarting && node.PlacementMetrics.InProgressCount() > maxStartingInstancesPerNode { | ||
| return false | ||
| } | ||
|
|
||
| return true | ||
| } | ||
|
|
||
| // sample returns up to k items chosen uniformly from those passing ok. | ||
| func (b *BestOfK) sample(items []*nodemanager.Node, config BestOfKConfig, excludedNodes map[string]struct{}, resources nodemanager.SandboxResources, buildMachineInfo machineinfo.MachineInfo, filterByLabels bool, requiredLabels []string) []*nodemanager.Node { | ||
| if config.K <= 0 || len(items) == 0 { | ||
|
|
@@ -163,40 +217,9 @@ func (b *BestOfK) sample(items []*nodemanager.Node, config BestOfKConfig, exclud | |
|
|
||
| n := items[pick] | ||
|
|
||
|
ValentaTomas marked this conversation as resolved.
|
||
| if b.isCandidate(n, config, excludedNodes, resources, buildMachineInfo, filterByLabels, requiredLabels) { | ||
| candidates = append(candidates, n) | ||
| } | ||
| } | ||
|
|
||
| return candidates | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
what does this fix?