daandemeyer / rpms / systemd

Forked from rpms/systemd 2 years ago
Clone
52b84b
From 556375ae1d8d0b460d691888f2fb7ea520fe9a6b Mon Sep 17 00:00:00 2001
52b84b
From: Chris Down <chris@chrisdown.name>
52b84b
Date: Tue, 30 Apr 2019 14:22:04 -0400
52b84b
Subject: [PATCH] cgroup: Polish hierarchically aware protection docs a bit
52b84b
52b84b
I missed adding a section in `systemd.resource-control` about
52b84b
DefaultMemoryMin in #12332.
52b84b
52b84b
Also, add a NEWS entry going over the general concept.
52b84b
52b84b
(cherry picked from commit acdb4b5236f38bbefbcc4a47fdbb9cd558b4b5c5)
52b84b
52b84b
Related: #1763435
52b84b
---
52b84b
 doc/TRANSIENT-SETTINGS.md        | 1 +
52b84b
 man/systemd.resource-control.xml | 8 ++++++--
52b84b
 2 files changed, 7 insertions(+), 2 deletions(-)
52b84b
52b84b
diff --git a/doc/TRANSIENT-SETTINGS.md b/doc/TRANSIENT-SETTINGS.md
52b84b
index 5a8fa0727e..1a4e79190a 100644
52b84b
--- a/doc/TRANSIENT-SETTINGS.md
52b84b
+++ b/doc/TRANSIENT-SETTINGS.md
52b84b
@@ -222,6 +222,7 @@ All cgroup/resource control settings are available for transient units
52b84b
 ✓ AllowedCPUs=
52b84b
 ✓ AllowedMemoryNodes=
52b84b
 ✓ MemoryAccounting=
52b84b
+✓ DefaultMemoryMin=
52b84b
 ✓ MemoryMin=
52b84b
 ✓ DefaultMemoryLow=
52b84b
 ✓ MemoryLow=
52b84b
diff --git a/man/systemd.resource-control.xml b/man/systemd.resource-control.xml
52b84b
index 27f16001dd..d3bff29169 100644
52b84b
--- a/man/systemd.resource-control.xml
52b84b
+++ b/man/systemd.resource-control.xml
52b84b
@@ -283,6 +283,10 @@
52b84b
 
52b84b
           <para>This setting is supported only if the unified control group hierarchy is used and disables
52b84b
           <varname>MemoryLimit=</varname>.</para>
52b84b
+
52b84b
+          <para>Units may have their children use a default <literal>memory.min</literal> value by specifying
52b84b
+          <varname>DefaultMemoryMin=</varname>, which has the same semantics as <varname>MemoryMin=</varname>. This setting
52b84b
+          does not affect <literal>memory.min</literal> in the unit itself.</para>
52b84b
         </listitem>
52b84b
       </varlistentry>
52b84b
 
52b84b
@@ -306,8 +310,8 @@
52b84b
           <para>This setting is supported only if the unified control group hierarchy is used and disables
52b84b
           <varname>MemoryLimit=</varname>.</para>
52b84b
 
52b84b
-          <para>Units may can have their children use a default <literal>memory.low</literal> value by specifying
52b84b
-          <varname>DefaultMemoryLow=</varname>, which has the same usage as <varname>MemoryLow=</varname>. This setting
52b84b
+          <para>Units may have their children use a default <literal>memory.low</literal> value by specifying
52b84b
+          <varname>DefaultMemoryLow=</varname>, which has the same semantics as <varname>MemoryLow=</varname>. This setting
52b84b
           does not affect <literal>memory.low</literal> in the unit itself.</para>
52b84b
         </listitem>
52b84b
       </varlistentry>