Merge pull request #4028 from jrife/release-1.1

[1.1 backport] Handle kmem.limit_in_bytes removal
This commit is contained in:
Kir Kolyshkin
2023-09-26 11:49:17 -07:00
committed by GitHub
+6
View File
@@ -234,6 +234,12 @@ func getMemoryData(path, name string) (cgroups.MemoryData, error) {
memoryData.Failcnt = value
value, err = fscommon.GetCgroupParamUint(path, limit)
if err != nil {
if name == "kmem" && os.IsNotExist(err) {
// Ignore ENOENT as kmem.limit_in_bytes has
// been removed in newer kernels.
return memoryData, nil
}
return cgroups.MemoryData{}, err
}
memoryData.Limit = value