diff options
author | Anita Zhang <the.anitazha@gmail.com> | 2021-02-02 23:16:03 +0100 |
---|---|---|
committer | Anita Zhang <the.anitazha@gmail.com> | 2021-02-03 02:52:48 +0100 |
commit | 0a9f93443be9e04fa77317bc5e28742b433277c6 (patch) | |
tree | 9b17a938938730ac1035f57f4d4ff8e09e5db5a9 /man | |
parent | parse-util: add permyriad parsing (diff) | |
download | systemd-0a9f93443be9e04fa77317bc5e28742b433277c6.tar.xz systemd-0a9f93443be9e04fa77317bc5e28742b433277c6.zip |
oom: rework *MemoryPressureLimit= properties to have 1/10000 precision
Requested in
https://github.com/systemd/systemd/pull/15206#discussion_r505506657,
preserve the full granularity for memory pressure limits (permyriad)
instead of capping out at percent.
Diffstat (limited to 'man')
-rw-r--r-- | man/oomd.conf.xml | 6 | ||||
-rw-r--r-- | man/org.freedesktop.systemd1.xml | 36 | ||||
-rw-r--r-- | man/systemd.resource-control.xml | 2 |
3 files changed, 22 insertions, 22 deletions
diff --git a/man/oomd.conf.xml b/man/oomd.conf.xml index bb5da87c54..2a12be8cad 100644 --- a/man/oomd.conf.xml +++ b/man/oomd.conf.xml @@ -59,10 +59,10 @@ </varlistentry> <varlistentry> - <term><varname>DefaultMemoryPressureLimitPercent=</varname></term> + <term><varname>DefaultMemoryPressureLimit=</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>. + 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 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>, @@ -78,7 +78,7 @@ <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>. + <varname>DefaultMemoryPressureLimit=</varname> and <varname>ManagedOOMMemoryPressureLimit=</varname>. Defaults to 30 seconds when this property is unset or set to 0.</para></listitem> </varlistentry> diff --git a/man/org.freedesktop.systemd1.xml b/man/org.freedesktop.systemd1.xml index 6783d19b21..7543a617b7 100644 --- a/man/org.freedesktop.systemd1.xml +++ b/man/org.freedesktop.systemd1.xml @@ -2449,7 +2449,7 @@ node /org/freedesktop/systemd1/unit/avahi_2ddaemon_2eservice { @org.freedesktop.DBus.Property.EmitsChangedSignal("false") readonly s ManagedOOMMemoryPressure = '...'; @org.freedesktop.DBus.Property.EmitsChangedSignal("false") - readonly s ManagedOOMMemoryPressureLimitPercent = '...'; + readonly u ManagedOOMMemoryPressureLimitPermyriad = ...; @org.freedesktop.DBus.Property.EmitsChangedSignal("const") readonly as Environment = ['...', ...]; @org.freedesktop.DBus.Property.EmitsChangedSignal("const") @@ -2972,7 +2972,7 @@ node /org/freedesktop/systemd1/unit/avahi_2ddaemon_2eservice { <!--property ManagedOOMMemoryPressure is not documented!--> - <!--property ManagedOOMMemoryPressureLimitPercent is not documented!--> + <!--property ManagedOOMMemoryPressureLimitPermyriad is not documented!--> <!--property EnvironmentFiles is not documented!--> @@ -3536,7 +3536,7 @@ node /org/freedesktop/systemd1/unit/avahi_2ddaemon_2eservice { <variablelist class="dbus-property" generated="True" extra-ref="ManagedOOMMemoryPressure"/> - <variablelist class="dbus-property" generated="True" extra-ref="ManagedOOMMemoryPressureLimitPercent"/> + <variablelist class="dbus-property" generated="True" extra-ref="ManagedOOMMemoryPressureLimitPermyriad"/> <variablelist class="dbus-property" generated="True" extra-ref="Environment"/> @@ -4203,7 +4203,7 @@ node /org/freedesktop/systemd1/unit/avahi_2ddaemon_2esocket { @org.freedesktop.DBus.Property.EmitsChangedSignal("false") readonly s ManagedOOMMemoryPressure = '...'; @org.freedesktop.DBus.Property.EmitsChangedSignal("false") - readonly s ManagedOOMMemoryPressureLimitPercent = '...'; + readonly u ManagedOOMMemoryPressureLimitPermyriad = ...; @org.freedesktop.DBus.Property.EmitsChangedSignal("const") readonly as Environment = ['...', ...]; @org.freedesktop.DBus.Property.EmitsChangedSignal("const") @@ -4754,7 +4754,7 @@ node /org/freedesktop/systemd1/unit/avahi_2ddaemon_2esocket { <!--property ManagedOOMMemoryPressure is not documented!--> - <!--property ManagedOOMMemoryPressureLimitPercent is not documented!--> + <!--property ManagedOOMMemoryPressureLimitPermyriad is not documented!--> <!--property EnvironmentFiles is not documented!--> @@ -5316,7 +5316,7 @@ node /org/freedesktop/systemd1/unit/avahi_2ddaemon_2esocket { <variablelist class="dbus-property" generated="True" extra-ref="ManagedOOMMemoryPressure"/> - <variablelist class="dbus-property" generated="True" extra-ref="ManagedOOMMemoryPressureLimitPercent"/> + <variablelist class="dbus-property" generated="True" extra-ref="ManagedOOMMemoryPressureLimitPermyriad"/> <variablelist class="dbus-property" generated="True" extra-ref="Environment"/> @@ -5896,7 +5896,7 @@ node /org/freedesktop/systemd1/unit/home_2emount { @org.freedesktop.DBus.Property.EmitsChangedSignal("false") readonly s ManagedOOMMemoryPressure = '...'; @org.freedesktop.DBus.Property.EmitsChangedSignal("false") - readonly s ManagedOOMMemoryPressureLimitPercent = '...'; + readonly u ManagedOOMMemoryPressureLimitPermyriad = ...; @org.freedesktop.DBus.Property.EmitsChangedSignal("const") readonly as Environment = ['...', ...]; @org.freedesktop.DBus.Property.EmitsChangedSignal("const") @@ -6375,7 +6375,7 @@ node /org/freedesktop/systemd1/unit/home_2emount { <!--property ManagedOOMMemoryPressure is not documented!--> - <!--property ManagedOOMMemoryPressureLimitPercent is not documented!--> + <!--property ManagedOOMMemoryPressureLimitPermyriad is not documented!--> <!--property EnvironmentFiles is not documented!--> @@ -6855,7 +6855,7 @@ node /org/freedesktop/systemd1/unit/home_2emount { <variablelist class="dbus-property" generated="True" extra-ref="ManagedOOMMemoryPressure"/> - <variablelist class="dbus-property" generated="True" extra-ref="ManagedOOMMemoryPressureLimitPercent"/> + <variablelist class="dbus-property" generated="True" extra-ref="ManagedOOMMemoryPressureLimitPermyriad"/> <variablelist class="dbus-property" generated="True" extra-ref="Environment"/> @@ -7556,7 +7556,7 @@ node /org/freedesktop/systemd1/unit/dev_2dsda3_2eswap { @org.freedesktop.DBus.Property.EmitsChangedSignal("false") readonly s ManagedOOMMemoryPressure = '...'; @org.freedesktop.DBus.Property.EmitsChangedSignal("false") - readonly s ManagedOOMMemoryPressureLimitPercent = '...'; + readonly u ManagedOOMMemoryPressureLimitPermyriad = ...; @org.freedesktop.DBus.Property.EmitsChangedSignal("const") readonly as Environment = ['...', ...]; @org.freedesktop.DBus.Property.EmitsChangedSignal("const") @@ -8021,7 +8021,7 @@ node /org/freedesktop/systemd1/unit/dev_2dsda3_2eswap { <!--property ManagedOOMMemoryPressure is not documented!--> - <!--property ManagedOOMMemoryPressureLimitPercent is not documented!--> + <!--property ManagedOOMMemoryPressureLimitPermyriad is not documented!--> <!--property EnvironmentFiles is not documented!--> @@ -8487,7 +8487,7 @@ node /org/freedesktop/systemd1/unit/dev_2dsda3_2eswap { <variablelist class="dbus-property" generated="True" extra-ref="ManagedOOMMemoryPressure"/> - <variablelist class="dbus-property" generated="True" extra-ref="ManagedOOMMemoryPressureLimitPercent"/> + <variablelist class="dbus-property" generated="True" extra-ref="ManagedOOMMemoryPressureLimitPermyriad"/> <variablelist class="dbus-property" generated="True" extra-ref="Environment"/> @@ -9041,7 +9041,7 @@ node /org/freedesktop/systemd1/unit/system_2eslice { @org.freedesktop.DBus.Property.EmitsChangedSignal("false") readonly s ManagedOOMMemoryPressure = '...'; @org.freedesktop.DBus.Property.EmitsChangedSignal("false") - readonly s ManagedOOMMemoryPressureLimitPercent = '...'; + readonly u ManagedOOMMemoryPressureLimitPermyriad = ...; }; interface org.freedesktop.DBus.Peer { ... }; interface org.freedesktop.DBus.Introspectable { ... }; @@ -9176,7 +9176,7 @@ node /org/freedesktop/systemd1/unit/system_2eslice { <!--property ManagedOOMMemoryPressure is not documented!--> - <!--property ManagedOOMMemoryPressureLimitPercent is not documented!--> + <!--property ManagedOOMMemoryPressureLimitPermyriad is not documented!--> <!--Autogenerated cross-references for systemd.directives, do not edit--> @@ -9316,7 +9316,7 @@ node /org/freedesktop/systemd1/unit/system_2eslice { <variablelist class="dbus-property" generated="True" extra-ref="ManagedOOMMemoryPressure"/> - <variablelist class="dbus-property" generated="True" extra-ref="ManagedOOMMemoryPressureLimitPercent"/> + <variablelist class="dbus-property" generated="True" extra-ref="ManagedOOMMemoryPressureLimitPermyriad"/> <!--End of Autogenerated section--> @@ -9476,7 +9476,7 @@ node /org/freedesktop/systemd1/unit/session_2d1_2escope { @org.freedesktop.DBus.Property.EmitsChangedSignal("false") readonly s ManagedOOMMemoryPressure = '...'; @org.freedesktop.DBus.Property.EmitsChangedSignal("false") - readonly s ManagedOOMMemoryPressureLimitPercent = '...'; + readonly u ManagedOOMMemoryPressureLimitPermyriad = ...; @org.freedesktop.DBus.Property.EmitsChangedSignal("const") readonly s KillMode = '...'; @org.freedesktop.DBus.Property.EmitsChangedSignal("const") @@ -9627,7 +9627,7 @@ node /org/freedesktop/systemd1/unit/session_2d1_2escope { <!--property ManagedOOMMemoryPressure is not documented!--> - <!--property ManagedOOMMemoryPressureLimitPercent is not documented!--> + <!--property ManagedOOMMemoryPressureLimitPermyriad is not documented!--> <!--property KillMode is not documented!--> @@ -9793,7 +9793,7 @@ node /org/freedesktop/systemd1/unit/session_2d1_2escope { <variablelist class="dbus-property" generated="True" extra-ref="ManagedOOMMemoryPressure"/> - <variablelist class="dbus-property" generated="True" extra-ref="ManagedOOMMemoryPressureLimitPercent"/> + <variablelist class="dbus-property" generated="True" extra-ref="ManagedOOMMemoryPressureLimitPermyriad"/> <variablelist class="dbus-property" generated="True" extra-ref="KillMode"/> diff --git a/man/systemd.resource-control.xml b/man/systemd.resource-control.xml index 2e547d8b82..be9c35057d 100644 --- a/man/systemd.resource-control.xml +++ b/man/systemd.resource-control.xml @@ -901,7 +901,7 @@ DeviceAllow=/dev/loop-control </varlistentry> <varlistentry> - <term><varname>ManagedOOMMemoryPressureLimitPercent=</varname></term> + <term><varname>ManagedOOMMemoryPressureLimit=</varname></term> <listitem> <para>Overrides the default memory pressure limit set by |