1
1
mirror of https://github.com/systemd/systemd-stable.git synced 2025-09-19 01:45:00 +03:00

core,man: add missing integration of OOMPolicy= in scopes

Fixup for 5fa098357e.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2022-12-13 15:26:58 +01:00
parent 100d37d4f3
commit d5a1657d5a
3 changed files with 13 additions and 12 deletions

View File

@@ -105,6 +105,8 @@
of scope units are the following:</para> of scope units are the following:</para>
<variablelist class='unit-directives'> <variablelist class='unit-directives'>
<xi:include href="systemd.service.xml" xpointer="oom-policy" />
<varlistentry> <varlistentry>
<term><varname>RuntimeMaxSec=</varname></term> <term><varname>RuntimeMaxSec=</varname></term>

View File

@@ -1120,7 +1120,7 @@
above.</para></listitem> above.</para></listitem>
</varlistentry> </varlistentry>
<varlistentry> <varlistentry id='oom-policy'>
<term><varname>OOMPolicy=</varname></term> <term><varname>OOMPolicy=</varname></term>
<listitem><para>Configure the out-of-memory (OOM) killing policy for the kernel and the userspace OOM <listitem><para>Configure the out-of-memory (OOM) killing policy for the kernel and the userspace OOM
@@ -1133,18 +1133,17 @@
terminate services earlier, before the kernel would have to act.</para> terminate services earlier, before the kernel would have to act.</para>
<para>This setting takes one of <constant>continue</constant>, <constant>stop</constant> or <para>This setting takes one of <constant>continue</constant>, <constant>stop</constant> or
<constant>kill</constant>. If set to <constant>continue</constant> and a process of the service is <constant>kill</constant>. If set to <constant>continue</constant> and a process in the unit is
killed by the OOM killer, this is logged but the service continues running. If set to killed by the OOM killer, this is logged but the unit continues running. If set to
<constant>stop</constant> the event is logged but the service is terminated cleanly by the service <constant>stop</constant> the event is logged but the unit is terminated cleanly by the service
manager. If set to <constant>kill</constant> and one of the service's processes is killed by the OOM manager. If set to <constant>kill</constant> and one of the unit's processes is killed by the OOM
killer the kernel is instructed to kill all remaining processes of the service too, by setting the killer the kernel is instructed to kill all remaining processes of the unit too, by setting the
<filename>memory.oom.group</filename> attribute to <constant>1</constant>; also see <ulink <filename>memory.oom.group</filename> attribute to <constant>1</constant>; also see <ulink
url="https://docs.kernel.org/admin-guide/cgroup-v2.html">kernel documentation</ulink>. url="https://docs.kernel.org/admin-guide/cgroup-v2.html">kernel documentation</ulink>.</para>
</para>
<para>Defaults to the setting <varname>DefaultOOMPolicy=</varname> in <para>Defaults to the setting <varname>DefaultOOMPolicy=</varname> in
<citerefentry><refentrytitle>systemd-system.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry> <citerefentry><refentrytitle>systemd-system.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>
is set to, except for services where <varname>Delegate=</varname> is turned on, where it defaults to is set to, except for units where <varname>Delegate=</varname> is turned on, where it defaults to
<constant>continue</constant>.</para> <constant>continue</constant>.</para>
<para>Use the <varname>OOMScoreAdjust=</varname> setting to configure whether processes of the unit <para>Use the <varname>OOMScoreAdjust=</varname> setting to configure whether processes of the unit
@@ -1154,10 +1153,9 @@
details.</para> details.</para>
<para>This setting also applies to <command>systemd-oomd</command>. Similarly to the kernel OOM <para>This setting also applies to <command>systemd-oomd</command>. Similarly to the kernel OOM
kills, this setting determines the state of the service after <command>systemd-oomd</command> kills a kills, this setting determines the state of the unit after <command>systemd-oomd</command> kills a
cgroup associated with the service.</para></listitem> cgroup associated with it.</para></listitem>
</varlistentry> </varlistentry>
</variablelist> </variablelist>
<para id='shared-unit-options'>Check <para id='shared-unit-options'>Check

View File

@@ -556,6 +556,7 @@ Path.TriggerLimitBurst, config_parse_unsigned,
Scope.RuntimeMaxSec, config_parse_sec, 0, offsetof(Scope, runtime_max_usec) Scope.RuntimeMaxSec, config_parse_sec, 0, offsetof(Scope, runtime_max_usec)
Scope.RuntimeRandomizedExtraSec, config_parse_sec, 0, offsetof(Scope, runtime_rand_extra_usec) Scope.RuntimeRandomizedExtraSec, config_parse_sec, 0, offsetof(Scope, runtime_rand_extra_usec)
Scope.TimeoutStopSec, config_parse_sec, 0, offsetof(Scope, timeout_stop_usec) Scope.TimeoutStopSec, config_parse_sec, 0, offsetof(Scope, timeout_stop_usec)
Scope.OOMPolicy, config_parse_oom_policy, 0, offsetof(Scope, oom_policy)
{# The [Install] section is ignored here #} {# The [Install] section is ignored here #}
Install.Alias, NULL, 0, 0 Install.Alias, NULL, 0, 0
Install.WantedBy, NULL, 0, 0 Install.WantedBy, NULL, 0, 0