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

oversubscription: driver/exec to honor MemoryMaxMB

Browse Source
This commit is contained in:
Mahmood Ali
2021-03-26 16:17:14 -04:00
parent b1ff06fd19
commit 5e3fbd5774
4 changed files with 254 additions and 235 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/shared/executor/executor_linux.go
View File

@@ -682,9 +682,16 @@ func configureCgroups(cfg *lconfigs.Config, command *ExecCommand) error {
return nil
}
if mb := command.Resources.NomadResources.Memory.MemoryMB; mb > 0 {
// Total amount of memory allowed to consume
cfg.Cgroups.Resources.Memory = mb * 1024 * 1024
// Total amount of memory allowed to consume
var memoryLimit int64
if res := command.Resources.NomadResources.Memory; res.MemoryMaxMB > 0 {
memoryLimit = res.MemoryMaxMB * 1024 * 1024
} else if res.MemoryMB > 0 {
memoryLimit = res.MemoryMB * 1024 * 1024
}
if memoryLimit > 0 {
cfg.Cgroups.Resources.Memory = memoryLimit
// Disable swap to avoid issues on the machine
var memSwappiness uint64
cfg.Cgroups.Resources.MemorySwappiness = &memSwappiness