mirror of
https://github.com/systemd/systemd
synced 2024-09-06 16:56:43 +00:00
cgroup: Check ancestor memory min for unified memory config
Otherwise we might not enable it when we should, ie. DefaultMemoryMin is set in a parent, but not MemoryMin in the current unit.
This commit is contained in:
parent
ff7d6a740b
commit
7c9d2b7993
|
@ -955,7 +955,7 @@ static bool unit_has_unified_memory_config(Unit *u) {
|
|||
c = unit_get_cgroup_context(u);
|
||||
assert(c);
|
||||
|
||||
return c->memory_min > 0 || unit_get_ancestor_memory_low(u) > 0 ||
|
||||
return unit_get_ancestor_memory_min(u) > 0 || unit_get_ancestor_memory_low(u) > 0 ||
|
||||
c->memory_high != CGROUP_LIMIT_MAX || c->memory_max != CGROUP_LIMIT_MAX ||
|
||||
c->memory_swap_max != CGROUP_LIMIT_MAX;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue