dasharo/systemd
0
0
Fork 0
mirror of https://github.com/Dasharo/systemd.git synced 2026-03-06 15:02:31 -08:00
Code Issues Packages Projects Releases Wiki Activity

core/cgroup: use the cached memory accounting value when cgroup is gone

Browse Source 
Follow-up for 9824ab1f00

Fixes https://github.com/systemd/systemd/issues/28542#issuecomment-1825413237
This commit is contained in:
Mike Yuan
2023-11-24 23:20:41 +08:00
parent bfb6b1214a
commit f17b07f4d7
1 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/core/cgroup.c
View File

@@ -4052,6 +4052,7 @@ int unit_get_memory_accounting(Unit *u, CGroupMemoryAccountingMetric metric, uin
};
uint64_t bytes;
bool updated = false;
int r;
assert(u);
@@ -4062,7 +4063,8 @@ int unit_get_memory_accounting(Unit *u, CGroupMemoryAccountingMetric metric, uin
return -ENODATA;
if (!u->cgroup_path)
return -ENODATA;
/* If the cgroup is already gone, we try to find the last cached value. */
goto cache;
/* The root cgroup doesn't expose this information. */
if (unit_has_host_root_cgroup(u))
@@ -4078,19 +4080,22 @@ int unit_get_memory_accounting(Unit *u, CGroupMemoryAccountingMetric metric, uin
return -ENODATA;
r = cg_get_attribute_as_uint64("memory", u->cgroup_path, attributes_table[metric], &bytes);
if (r < 0 && (r != -ENODATA || metric > _CGROUP_MEMORY_ACCOUNTING_METRIC_CACHED_LAST))
if (r < 0 && r != -ENODATA)
return r;
updated = r >= 0;
if (metric <= _CGROUP_MEMORY_ACCOUNTING_METRIC_CACHED_LAST) {
uint64_t *last = &u->memory_accounting_last[metric];
cache:
if (metric > _CGROUP_MEMORY_ACCOUNTING_METRIC_CACHED_LAST)
return -ENODATA;
if (r >= 0)
*last = bytes;
else if (*last != UINT64_MAX)
bytes = *last;
else
return r;
}
uint64_t *last = &u->memory_accounting_last[metric];
if (updated)
*last = bytes;
else if (*last != UINT64_MAX)
bytes = *last;
else
return -ENODATA;
if (ret)
*ret = bytes;