Skip to content

Commit a32ad76

Browse files
authored
Merge pull request #4018 from jrife/main
Handle kmem.limit_in_bytes removal
2 parents f235fa6 + 99469eb commit a32ad76

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

libcontainer/cgroups/fs/memory.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -234,6 +234,12 @@ func getMemoryData(path, name string) (cgroups.MemoryData, error) {
234234
memoryData.Failcnt = value
235235
value, err = fscommon.GetCgroupParamUint(path, limit)
236236
if err != nil {
237+
if name == "kmem" && os.IsNotExist(err) {
238+
// Ignore ENOENT as kmem.limit_in_bytes has
239+
// been removed in newer kernels.
240+
return memoryData, nil
241+
}
242+
237243
return cgroups.MemoryData{}, err
238244
}
239245
memoryData.Limit = value

0 commit comments

Comments
 (0)