openstack/zun
Code Issues Proposed changes

Stats report diferencies

Browse Source 
There is a difference between "openstack appcontainer stats <id>"
and "docker stats <id>" in memory value.
Cache Usage should be removed from the memory usage while calculating
which is present in docker SDK.
This patch contains the Cgroup V1 and V2 handling for Memory stats

Closes-Bug: #1989792
Change-Id: I4f1d9b738ee5de176b6e0ef69593363f2977f07a
This commit is contained in:
Malleswari Varanasi 2023-04-18 08:43:46 -07:00
parent 6b89ceac6f
commit 4fa358474e
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
zun/container/docker/driver.py
View File

@ -981,7 +981,21 @@ class DockerDriver(driver.BaseDriver, driver.ContainerDriver,
cpu_usage = res['cpu_stats']['cpu_usage']['total_usage'] cpu_usage = res['cpu_stats']['cpu_usage']['total_usage']
system_cpu_usage = res['cpu_stats']['system_cpu_usage'] system_cpu_usage = res['cpu_stats']['system_cpu_usage']
cpu_percent = float(cpu_usage) / float(system_cpu_usage) * 100 cpu_percent = float(cpu_usage) / float(system_cpu_usage) * 100
mem_usage = res['memory_stats']['usage'] / 1024 / 1024
# Subtract the Cache Usage from total memory Usage
cache_usage = 0
if res['memory_stats'].get('stats'):
if res['memory_stats']['stats'].get('total_inactive_file'):
# For Cgroup V1
cache_usage = res['memory_stats']['stats'].get(
'total_inactive_file')
elif res['memory_stats']['stats'].get('inactive_file'):
# For Cgroup V2
cache_usage = res['memory_stats']['stats'].get(
'inactive_file')
mem_usage = res['memory_stats']['usage'] - cache_usage
mem_usage = mem_usage / 1024 / 1024
mem_limit = res['memory_stats']['limit'] / 1024 / 1024 mem_limit = res['memory_stats']['limit'] / 1024 / 1024
mem_percent = float(mem_usage) / float(mem_limit) * 100 mem_percent = float(mem_usage) / float(mem_limit) * 100