scheduler: fix a bug where we subtract reserved node resources twice (#…

…23386) Fixes a bug in the nodeResources.Comparable method, where CPU resources were accidentally offset with reserved resources, whereas functions that use this field expect total CPU resources.
hashicorp · Jun 21, 2024 · 8f80bd5 · 8f80bd5
1 parent c84b4ad
commit 8f80bd5
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/.changelog/23386.txt b/.changelog/23386.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+scheduler: Fix a bug where reserved resources are not calculated correctly
+```
diff --git a/nomad/structs/funcs_test.go b/nomad/structs/funcs_test.go
@@ -105,6 +105,7 @@ func node2k() *Node {
 						Grade:     numalib.Performance,
 						BaseSpeed: 1000,
 					}},
+					OverrideWitholdCompute: 1000, // set by client reserved field
 				},
 			},
 			Memory: NodeMemoryResources{

diff --git a/nomad/structs/structs.go b/nomad/structs/structs.go
@@ -3191,7 +3191,7 @@ func (n *NodeResources) Comparable() *ComparableResources {
 	c := &ComparableResources{
 		Flattened: AllocatedTaskResources{
 			Cpu: AllocatedCpuResources{
-				CpuShares:     int64(n.Processors.Topology.UsableCompute()),
+				CpuShares:     int64(n.Processors.Topology.TotalCompute()),
 				ReservedCores: reservableCores,
 			},
 			Memory: AllocatedMemoryResources{