diff options
author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2022-04-26 22:04:31 +0200 |
---|---|---|
committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2022-04-28 15:46:44 +0200 |
commit | 6f83ea60e90b18e44cc979834aae2947afa66834 (patch) | |
tree | 3737967c9eda6e1961ae4d0dbd66727d1227a17d /man/systemd.service.xml | |
parent | c0a96b1b1d19a06a3828885b10a275c423a5e6f2 (diff) | |
download | systemd-6f83ea60e90b18e44cc979834aae2947afa66834.tar.gz |
man: beef up the description of systemd-oomd.service
The gist of the description is moved from systemd.resource-control
to systemd-oomd man page. Cross-references to OOMPolicy, memory.oom.group,
oomctl, ManagedOOMSwap and ManagedOOMMemoryPressure are added in all
places.
The descriptions are also more down-to-earth: instead of talking
about "taking action" let's just say "kill". We *might* add configuration
for different actions in the future, but we're not there yet, so let's
just describe what we do now.
Diffstat (limited to 'man/systemd.service.xml')
-rw-r--r-- | man/systemd.service.xml | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/man/systemd.service.xml b/man/systemd.service.xml index 4e4a9732e4..ad303d440b 100644 --- a/man/systemd.service.xml +++ b/man/systemd.service.xml @@ -1130,8 +1130,12 @@ killed by the kernel's OOM killer this is logged but the service continues running. If set to <constant>stop</constant> the event is logged but the service 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 - killer the kernel is instructed to kill all remaining processes of the service, too. Defaults to the - setting <varname>DefaultOOMPolicy=</varname> in + killer the kernel is instructed to kill all remaining processes of the service too, by setting the + <filename>memory.oom.group</filename> attribute to <constant>1</constant>; also see <ulink + url="https://www.kernel.org/doc/html/latest/admin-guide/cgroup-v2.html">kernel documentation</ulink>. + </para> + + <para>Defaults to the setting <varname>DefaultOOMPolicy=</varname> in <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 <constant>continue</constant>.</para> @@ -1142,9 +1146,9 @@ <citerefentry><refentrytitle>systemd.exec</refentrytitle><manvolnum>5</manvolnum></citerefentry> for details.</para> - <para>This setting also applies to <command>systemd-oomd</command>, similar to kernel OOM kills - this setting determines the state of the service after <command>systemd-oomd</command> kills a cgroup associated - with the service.</para></listitem> + <para>This setting also applies to <command>systemd-oomd</command>, similar to the kernel OOM kills + this setting determines the state of the service after <command>systemd-oomd</command> kills a cgroup + associated with the service.</para></listitem> </varlistentry> </variablelist> |