github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Update runtime spec to 96de01bbb42c7af89bff100e10a

Browse Source 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
This commit is contained in:
Michael Crosby
2017-07-12 16:29:23 -07:00
parent a38bce0502
commit 83a38c2cec
7 changed files with 11 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
vendor/github.com/containerd/cgroups/memory.go generated vendored
View File

@@ -274,7 +274,7 @@ func getMemorySettings(resources *specs.LinuxResources) []memorySettings {
},
{
name: "oom_control",
value: getOomControlValue(resources),
value: getOomControlValue(mem),
},
{
name: "swappiness",
@@ -295,8 +295,8 @@ func checkEBUSY(err error) error {
return err
}
func getOomControlValue(resources *specs.LinuxResources) *int64 {
if resources.DisableOOMKiller != nil && *resources.DisableOOMKiller {
func getOomControlValue(mem *specs.LinuxMemory) *int64 {
if mem.DisableOOMKiller != nil && *mem.DisableOOMKiller {
i := int64(1)
return &i
}