mirror of
https://github.com/clearlinux/docker.git
synced 2026-10-03 15:28:35 +00:00
Merge pull request #14006 from hqhq/hq_add_kmem_limit
Add support for kernel memory limit
This commit is contained in:
@@ -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 {
|
||||
|
||||
@@ -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,
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user