Merge pull request #4018 from jrife/main

Handle kmem.limit_in_bytes removal
opencontainers · Sep 25, 2023 · a32ad76 · a32ad76
2 parents f235fa6 + 99469eb
commit a32ad76
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/libcontainer/cgroups/fs/memory.go b/libcontainer/cgroups/fs/memory.go
@@ -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