Merge pull request #14006 from hqhq/hq_add_kmem_limit

Add support for kernel memory limit
This commit is contained in:
Jessie Frazelle 2015-08-21 14:34:27 -07:00
commit 48cce1cd42
2 changed files with 8 additions and 0 deletions

View file

@ -36,6 +36,9 @@ type cgroupMemInfo struct {
// Whether memory swappiness is supported or not
MemorySwappiness bool
// Whether kernel memory limit is supported or not
KernelMemory bool
}
type cgroupCPUInfo struct {

View file

@ -57,12 +57,17 @@ func checkCgroupMem(quiet bool) cgroupMemInfo {
if !quiet && !memorySwappiness {
logrus.Warnf("Your kernel does not support memory swappiness.")
}
kernelMemory := cgroupEnabled(mountPoint, "memory.kmem.limit_in_bytes")
if !quiet && !kernelMemory {
logrus.Warnf("Your kernel does not support kernel memory limit.")
}
return cgroupMemInfo{
MemoryLimit: true,
SwapLimit: swapLimit,
OomKillDisable: oomKillDisable,
MemorySwappiness: memorySwappiness,
KernelMemory: kernelMemory,
}
}