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

core: plumbing to support numa aware scheduling (#18681)

Browse Source 
* core: plumbing to support numa aware scheduling

* core: apply node resources compatibility upon fsm rstore

Handle the case where an upgraded server dequeus an evaluation before
a client triggers a new fingerprint - which would be needed to cause
the compatibility fix to run. By running the compat fix on restore the
server will immediately have the compatible pseudo topology to use.

* lint: learn how to spell pseudo
This commit is contained in:
Seth Hoenig
2023-10-19 15:09:30 -05:00
committed by GitHub
parent 0410b8acea
commit 83720740f5
56 changed files with 1299 additions and 1487 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
command/node_status.go
View File

@@ -932,14 +932,12 @@ func getAllocatedResources(client *api.Client, runningAllocs []*api.Allocation,
func computeNodeTotalResources(node *api.Node) api.Resources {
total := api.Resources{}
r := node.Resources
res := node.Reserved
if res == nil {
res = &api.Resources{}
}
total.CPU = pointer.Of(*r.CPU - *res.CPU)
total.MemoryMB = pointer.Of(*r.MemoryMB - *res.MemoryMB)
total.DiskMB = pointer.Of(*r.DiskMB - *res.DiskMB)
r := node.NodeResources
res := node.ReservedResources
total.CPU = pointer.Of[int](int(r.Cpu.CpuShares) - int(res.Cpu.CpuShares))
total.MemoryMB = pointer.Of[int](int(r.Memory.MemoryMB) - int(res.Memory.MemoryMB))
total.DiskMB = pointer.Of[int](int(r.Disk.DiskMB) - int(res.Disk.DiskMB))
return total
}
@@ -1001,7 +999,7 @@ func getHostResources(hostStats *api.HostStats, node *api.Node) ([]string, error
if physical {
resources[1] = fmt.Sprintf("%v/%d MHz|%s/%s|%s/%s",
math.Floor(hostStats.CPUTicksConsumed),
*node.Resources.CPU,
node.NodeResources.Cpu.CpuShares,
humanize.IBytes(hostStats.Memory.Used),
humanize.IBytes(hostStats.Memory.Total),
humanize.IBytes(diskUsed),
@@ -1012,7 +1010,7 @@ func getHostResources(hostStats *api.HostStats, node *api.Node) ([]string, error
// since nomad doesn't collect the stats data.
resources[1] = fmt.Sprintf("%v/%d MHz|%s/%s|(%s)",
math.Floor(hostStats.CPUTicksConsumed),
*node.Resources.CPU,
node.NodeResources.Cpu.CpuShares,
humanize.IBytes(hostStats.Memory.Used),
humanize.IBytes(hostStats.Memory.Total),
storageDevice,