daandemeyer / rpms / systemd

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