daandemeyer / rpms / systemd

Forked from rpms/systemd 2 years ago
Clone
52b84b
From ef4157dab3d267c33ec2a06ae9bb5e4c87f785a6 Mon Sep 17 00:00:00 2001
52b84b
From: Chris Down <chris@chrisdown.name>
52b84b
Date: Fri, 3 May 2019 08:40:11 -0400
52b84b
Subject: [PATCH] cgroup: Test that it's possible to set memory protection to 0
52b84b
 again
52b84b
52b84b
The previous commit fixes this up, and this should prevent it
52b84b
regressing.
52b84b
52b84b
(cherry picked from commit 465ace74d9820824968ab5e82c81e42c2f1894b0)
52b84b
52b84b
Related: #1763435
52b84b
---
52b84b
 src/test/test-cgroup-unit-default.c | 6 +++---
52b84b
 test/dml-passthrough-set-ml.service | 2 +-
52b84b
 2 files changed, 4 insertions(+), 4 deletions(-)
52b84b
52b84b
diff --git a/src/test/test-cgroup-unit-default.c b/src/test/test-cgroup-unit-default.c
52b84b
index 54f7d50c45..1938609cee 100644
52b84b
--- a/src/test/test-cgroup-unit-default.c
52b84b
+++ b/src/test/test-cgroup-unit-default.c
52b84b
@@ -39,7 +39,7 @@ static int test_default_memory_low(void) {
52b84b
          * 1. dml-passthrough.slice sets MemoryLow=100. This should not affect its children, as only
52b84b
          *    DefaultMemoryLow is propagated, not MemoryLow. As such, all leaf services should end up with
52b84b
          *    memory.low as 50, inherited from dml.slice, *except* for dml-passthrough-set-ml.service, which
52b84b
-         *    should have the value of 25, as it has MemoryLow explicitly set.
52b84b
+         *    should have the value of 0, as it has MemoryLow explicitly set.
52b84b
          *
52b84b
          *                                                  ┌───────────┐
52b84b
          *                                                  │ dml.slice │
52b84b
@@ -49,7 +49,7 @@ static int test_default_memory_low(void) {
52b84b
          *                                            │ dml-passthrough.slice │
52b84b
          *                                            └───────────┬───────────┘
52b84b
          *                    ┌───────────────────────────────────┼───────────────────────────────────┐
52b84b
-         *             no new settings                   DefaultMemoryLow=15                     MemoryLow=25
52b84b
+         *             no new settings                   DefaultMemoryLow=15                     MemoryLow=0
52b84b
          *    ┌───────────────┴───────────────┐  ┌────────────────┴────────────────┐  ┌───────────────┴────────────────┐
52b84b
          *    │ dml-passthrough-empty.service │  │ dml-passthrough-set-dml.service │  │ dml-passthrough-set-ml.service │
52b84b
          *    └───────────────────────────────┘  └─────────────────────────────────┘  └────────────────────────────────┘
52b84b
@@ -122,7 +122,7 @@ static int test_default_memory_low(void) {
52b84b
         assert_se(unit_get_ancestor_memory_low(dml_passthrough) == 100);
52b84b
         assert_se(unit_get_ancestor_memory_low(dml_passthrough_empty) == dml_tree_default);
52b84b
         assert_se(unit_get_ancestor_memory_low(dml_passthrough_set_dml) == 50);
52b84b
-        assert_se(unit_get_ancestor_memory_low(dml_passthrough_set_ml) == 25);
52b84b
+        assert_se(unit_get_ancestor_memory_low(dml_passthrough_set_ml) == 0);
52b84b
 
52b84b
         assert_se(unit_get_ancestor_memory_low(dml_override) == dml_tree_default);
52b84b
         assert_se(unit_get_ancestor_memory_low(dml_override_empty) == 10);
52b84b
diff --git a/test/dml-passthrough-set-ml.service b/test/dml-passthrough-set-ml.service
52b84b
index 2abd591389..2e568b5deb 100644
52b84b
--- a/test/dml-passthrough-set-ml.service
52b84b
+++ b/test/dml-passthrough-set-ml.service
52b84b
@@ -5,4 +5,4 @@ Description=DML passthrough set ML service
52b84b
 Slice=dml-passthrough.slice
52b84b
 Type=oneshot
52b84b
 ExecStart=/bin/true
52b84b
-MemoryLow=25
52b84b
+MemoryLow=0