vbatts/pkg
1
0
Fork 0
Code Pull requests Releases Activity

Add support for kernel memory limit

Browse source 
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
This commit is contained in:
Qiang Huang 2015-08-19 23:56:55 +08:00
parent ad91ec8c4b
commit 3803847429
2 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
sysinfo/sysinfo.go
View file

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

5
sysinfo/sysinfo_linux.go
View file

@ -57,12 +57,17 @@ func checkCgroupMem(quiet bool) cgroupMemInfo {
if !quiet && !memorySwappiness { if !quiet && !memorySwappiness {
logrus.Warnf("Your kernel does not support memory swappiness.") 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{ return cgroupMemInfo{
MemoryLimit: true, MemoryLimit: true,
SwapLimit: swapLimit, SwapLimit: swapLimit,
OomKillDisable: oomKillDisable, OomKillDisable: oomKillDisable,
MemorySwappiness: memorySwappiness, MemorySwappiness: memorySwappiness,
KernelMemory: kernelMemory,
} }
} }