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