From 9c04746fb35b32b592fe14cab43782db9e0dee5c Mon Sep 17 00:00:00 2001 From: Chris Down Date: Mon, 30 Sep 2019 18:25:09 +0100 Subject: [PATCH] cgroup: Respect DefaultMemoryMin when setting memory.min This is an oversight from https://github.com/systemd/systemd/pull/12332. Sadly the tests didn't catch it since it requires a real cgroup hierarchy to see, and it wasn't seen in prod since we're only currently using DefaultMemoryLow, not DefaultMemoryMin. :-( (cherry picked from commit 64fe532e90b3e99bf7821ded8a1107c239099e40) Related: #1763435 --- src/core/cgroup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/cgroup.c b/src/core/cgroup.c index 4299923754..7a9857adad 100644 --- a/src/core/cgroup.c +++ b/src/core/cgroup.c @@ -1111,7 +1111,7 @@ static void cgroup_context_apply( log_cgroup_compat(u, "Applying MemoryLimit %" PRIu64 " as MemoryMax", max); } - cgroup_apply_unified_memory_limit(u, "memory.min", c->memory_min); + cgroup_apply_unified_memory_limit(u, "memory.min", unit_get_ancestor_memory_min(u)); cgroup_apply_unified_memory_limit(u, "memory.low", unit_get_ancestor_memory_low(u)); cgroup_apply_unified_memory_limit(u, "memory.high", c->memory_high); cgroup_apply_unified_memory_limit(u, "memory.max", max);