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

Update runc/libcontainer and friends (#4655)

Browse Source 
* vendor: bump libcontainer and docker to remove Sirupsen imports

* vendor: fix bad vendoring of archive package

* vendor: fix api changes to cgroups in executor

* vendor: fix docker api changes

* vendor: update github.com/Azure/go-ansiterm to use non capitalized logrus import
This commit is contained in:
Nick Ethier
2018-09-13 23:00:31 -04:00
committed by Michael Schurter
parent 5cbd01329f
commit e9f3f2cfee
657 changed files with 70636 additions and 9072 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
client/driver/executor/executor_linux.go
View File

@@ -129,7 +129,8 @@ func (e *UniversalExecutor) configureCgroups(resources *structs.Resources) error
e.resConCtx.groups.Path = filepath.Join("/nomad", cgroupName)
// Allow access to /dev/
e.resConCtx.groups.Resources.AllowAllDevices = true
allowAllDevs := true
e.resConCtx.groups.Resources.AllowAllDevices = &allowAllDevs
// Use a cgroup but don't apply limits
if !e.command.ResourceLimits {
@@ -140,7 +141,7 @@ func (e *UniversalExecutor) configureCgroups(resources *structs.Resources) error
// Total amount of memory allowed to consume
e.resConCtx.groups.Resources.Memory = int64(resources.MemoryMB * 1024 * 1024)
// Disable swap to avoid issues on the machine
var memSwappiness int64 = 0
var memSwappiness uint64 = 0
e.resConCtx.groups.Resources.MemorySwappiness = &memSwappiness
}
@@ -149,7 +150,7 @@ func (e *UniversalExecutor) configureCgroups(resources *structs.Resources) error
}
// Set the relative CPU shares for this cgroup.
e.resConCtx.groups.Resources.CpuShares = int64(resources.CPU)
e.resConCtx.groups.Resources.CpuShares = uint64(resources.CPU)
if resources.IOPS != 0 {
// Validate it is in an acceptable range.