kemko/nomad
1
0
Fork 0
mirror of https://github.com/kemko/nomad.git synced 2026-01-06 10:25:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

scheduler: move result mutation into computeUpdates (#26336)

Browse Source 
The `computeUpdate` method returns 4 different values, some of which are just
different shapes of the same data and only ever get used to be applied to the
result in the caller. Move the mutation of the result into `computeUpdates` to
match the work done in #26325. Clean up the return signature so that only slices
we need downstream are returned, and fix the incorrect docstring.

Also fix a silent bug where the `inplace` set includes the original alloc and
not the updated version. This has no functional change because all existing
callers only ever look at the length of this slice, but it will prevent future
bugs if that ever changes.

Ref: https://github.com/hashicorp/nomad/pull/26325
Ref: https://hashicorp.atlassian.net/browse/NMD-819
This commit is contained in:
Tim Gross
2025-07-25 08:21:37 -04:00
committed by GitHub
parent 5989d5862a
commit 26554e544e
1 changed files with 17 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
scheduler/reconciler/reconcile_cluster.go
View File

@@ -544,12 +544,7 @@ func (a *AllocReconciler) computeGroup(group string, all allocSet) (*ReconcileRe
// Do inplace upgrades where possible and capture the set of upgrades that
// need to be done destructively.
var inplaceUpdateResult []*structs.Allocation
ignoreUpdates, inplace, inplaceUpdateResult, destructive := a.computeUpdates(tg, untainted)
result.InplaceUpdate = inplaceUpdateResult
result.DesiredTGUpdates[group].Ignore += uint64(len(ignoreUpdates))
result.DesiredTGUpdates[group].InPlaceUpdate += uint64(len(inplace))
inplace, destructive := a.computeUpdates(untainted, tg, result)
if !existingDeployment {
dstate.DesiredTotal += len(destructive) + len(inplace)
}
@@ -1361,17 +1356,16 @@ func (a *AllocReconciler) reconcileReconnecting(reconnecting allocSet, all alloc
}
// computeUpdates determines which allocations for the passed group require
// updates. Three groups are returned:
// 1. Those that require no upgrades
// 2. Those that can be upgraded in-place. These are added to the results
// automatically since the function contains the correct state to do so,
// 3. Those that require destructive updates
func (a *AllocReconciler) computeUpdates(group *structs.TaskGroup, untainted allocSet) (
ignore, inplaceUpdateMap allocSet, inplaceUpdateSlice []*structs.Allocation, destructive allocSet) {
// Determine the set of allocations that need to be updated
ignore = make(allocSet)
inplaceUpdateMap = make(allocSet)
inplaceUpdateSlice = make([]*structs.Allocation, 0)
// updates. This method updates the results with allocs to ignore and/or
// update. And two groups are returned:
// 1. Those that can be upgraded in-place
// 2. Those that require destructive updates
func (a *AllocReconciler) computeUpdates(
untainted allocSet, group *structs.TaskGroup, result *ReconcileResults,
) (inplace, destructive allocSet) {
ignore := make(allocSet)
inplace = make(allocSet)
destructive = make(allocSet)
for _, alloc := range untainted {
@@ -1381,10 +1375,14 @@ func (a *AllocReconciler) computeUpdates(group *structs.TaskGroup, untainted all
} else if destructiveChange {
destructive[alloc.ID] = alloc
} else {
inplaceUpdateMap[alloc.ID] = alloc
inplaceUpdateSlice = append(inplaceUpdateSlice, inplaceAlloc)
inplace[alloc.ID] = inplaceAlloc
}
}
result.InplaceUpdate = slices.Collect(maps.Values(inplace))
result.DesiredTGUpdates[group.Name].Ignore += uint64(len(ignore))
result.DesiredTGUpdates[group.Name].InPlaceUpdate += uint64(len(inplace))
return
}