Merge pull request #30284 from YHNdnzj/fstab-wantedby-defaultdeps

[thirdparty/systemd.git] / man / oomd.conf.xml

diff --git a/man/oomd.conf.xml b/man/oomd.conf.xml
index bb5da87c5485930a7679aec6c817c0f1014ac09c..e8f9b58658e77eb95346fa70b825013849aca85f 100644 (file)
--- a/man/oomd.conf.xml
+++ b/man/oomd.conf.xml
@@ -22,9 +22,11 @@
   </refnamediv>
 
   <refsynopsisdiv>
-    <para><filename>/etc/systemd/oomd.conf</filename></para>
-    <para><filename>/etc/systemd/oomd.conf.d/*.conf</filename></para>
-    <para><filename>/usr/lib/systemd/oomd.conf.d/*.conf</filename></para>
+    <para><simplelist>
+      <member><filename>/etc/systemd/oomd.conf</filename></member>
+      <member><filename>/etc/systemd/oomd.conf.d/*.conf</filename></member>
+      <member><filename>/usr/lib/systemd/oomd.conf.d/*.conf</filename></member>
+    </simplelist></para>
   </refsynopsisdiv>
 
   <refsect1>
@@ -48,38 +50,46 @@
 
     <variablelist class='config-directives'>
       <varlistentry>
-        <term><varname>SwapUsedLimitPercent=</varname></term>
-
-        <listitem><para>Sets the limit for swap usage on the system before <command>systemd-oomd</command> will
-        take action. If the percentage of swap used on the system is more than what is defined here,
-        <command>systemd-oomd</command> will act on eligible descendant cgroups, starting from the ones with the
-        highest swap usage to the lowest swap usage. Which cgroups are monitored and what
-        action gets taken depends on what the unit has configured for <varname>ManagedOOMSwap=</varname>.
-        Takes a percentage value between 0% and 100%, inclusive. Defaults to 90%.</para></listitem>
+        <term><varname>SwapUsedLimit=</varname></term>
+
+        <listitem><para>Sets the limit for memory and swap usage on the system before <command>systemd-oomd</command>
+        will take action. If the fraction of memory used and the fraction of swap used on the system are both more than
+        what is defined here, <command>systemd-oomd</command> will act on eligible descendant control groups with swap
+        usage greater than 5% of total swap, starting from the ones with the highest swap usage. Which
+        control groups are monitored and what action gets taken depends on what the unit has configured for
+        <varname>ManagedOOMSwap=</varname>.  Takes a value specified in percent (when suffixed with "%"),
+        permille ("‰") or permyriad ("‱"), between 0% and 100%, inclusive. Defaults to 90%.</para>
+
+        <xi:include href="version-info.xml" xpointer="v247"/></listitem>
       </varlistentry>
 
       <varlistentry>
-        <term><varname>DefaultMemoryPressureLimitPercent=</varname></term>
-
-        <listitem><para>Sets the limit for memory pressure on the unit's cgroup before <command>systemd-oomd</command>
-        will take action. A unit can override this value with <varname>ManagedOOMMemoryPressureLimitPercent=</varname>.
-        The memory pressure for this property represents the fraction of time in a 10 second window in which all tasks
-        in the cgroup were delayed. For each monitored cgroup, if the memory pressure on that cgroup exceeds the
-        limit set for longer than the duration set by <varname>DefaultMemoryPressureDurationSec=</varname>,
-        <command>systemd-oomd</command> will act on eligible descendant cgroups,
-        starting from the ones with the most reclaim activity to the least reclaim activity. Which cgroups are
-        monitored and what action gets taken depends on what the unit has configured for
-        <varname>ManagedOOMMemoryPressure=</varname>. Takes a percentage value between 0% and 100%, inclusive.
-        Defaults to 60%.</para></listitem>
+        <term><varname>DefaultMemoryPressureLimit=</varname></term>
+
+        <listitem><para>Sets the limit for memory pressure on the unit's control group before
+        <command>systemd-oomd</command> will take action. A unit can override this value with
+        <varname>ManagedOOMMemoryPressureLimit=</varname>.  The memory pressure for this property represents
+        the fraction of time in a 10 second window in which all tasks in the control group were delayed. For
+        each monitored control group, if the memory pressure on that control group exceeds the limit set for
+        longer than the duration set by <varname>DefaultMemoryPressureDurationSec=</varname>,
+        <command>systemd-oomd</command> will act on eligible descendant control groups, starting from the
+        ones with the most reclaim activity to the least reclaim activity. Which control groups are monitored
+        and what action gets taken depends on what the unit has configured for
+        <varname>ManagedOOMMemoryPressure=</varname>. Takes a fraction specified in the same way as
+        <varname>SwapUsedLimit=</varname> above. Defaults to 60%.</para>
+
+        <xi:include href="version-info.xml" xpointer="v247"/></listitem>
       </varlistentry>
 
       <varlistentry>
         <term><varname>DefaultMemoryPressureDurationSec=</varname></term>
 
-        <listitem><para>Sets the amount of time a unit's cgroup needs to have exceeded memory pressure limits before
-        <command>systemd-oomd</command> will take action. Memory pressure limits are defined by
-        <varname>DefaultMemoryPressureLimitPercent=</varname> and <varname>ManagedOOMMemoryPressureLimitPercent=</varname>.
-        Defaults to 30 seconds when this property is unset or set to 0.</para></listitem>
+        <listitem><para>Sets the amount of time a unit's control group needs to have exceeded memory pressure
+        limits before <command>systemd-oomd</command> will take action. Memory pressure limits are defined by
+        <varname>DefaultMemoryPressureLimit=</varname> and <varname>ManagedOOMMemoryPressureLimit=</varname>.
+        Must be set to 0, or at least 1 second. Defaults to 30 seconds when unset or 0.</para>
+
+        <xi:include href="version-info.xml" xpointer="v248"/></listitem>
       </varlistentry>
 
     </variablelist>