shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-01-22 22:03:43 +03:00
Code

man: adjust description of CPUAccounting=

Browse Source 
For any user on a semi-recent kernel, effectively this setting is pointless.
We should deprecate it once not needed anymore for the v1 hierarchy. For
now, adjust the description.

(cherry picked from commit 695e39dd632801871b4e96b39bc8e7511083a34e)
(cherry picked from commit 4b12a1cf9249a2e59c2824958dfa6d56222c5d68)
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2023-03-07 16:09:35 +01:00
parent 52e2479bd6
commit f4764ea126
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
man/systemd-system.conf.xml
View File

@ -448,11 +448,11 @@
<varname>IPAccounting=</varname>. See <varname>IPAccounting=</varname>. See
<citerefentry><refentrytitle>systemd.resource-control</refentrytitle><manvolnum>5</manvolnum></citerefentry> <citerefentry><refentrytitle>systemd.resource-control</refentrytitle><manvolnum>5</manvolnum></citerefentry>
for details on the per-unit settings. <varname>DefaultTasksAccounting=</varname> defaults to yes, for details on the per-unit settings. <varname>DefaultTasksAccounting=</varname> defaults to yes,
<varname>DefaultMemoryAccounting=</varname> to <varname>DefaultMemoryAccounting=</varname> to &MEMORY_ACCOUNTING_DEFAULT;.
&MEMORY_ACCOUNTING_DEFAULT;. <varname>DefaultCPUAccounting=</varname> defaults to yes if enabling CPU <varname>DefaultCPUAccounting=</varname> defaults to yes, but really has no effect if enabling CPU
accounting doesn't require the CPU controller to be enabled (Linux 4.15+ using the unified hierarchy accounting doesn't require the <option>cpu</option> controller to be enabled (Linux 4.15+ using the
for resource control), otherwise it defaults to no. The other three settings default to unified hierarchy for resource control), otherwise it defaults to no. The other three settings
no.</para></listitem> default to no.</para></listitem>
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>

3
man/systemd.resource-control.xml
View File

@ -189,6 +189,9 @@ CPUWeight=20 DisableControllers=cpu / \
setting may be controlled with setting may be controlled with
<varname>DefaultCPUAccounting=</varname> in <varname>DefaultCPUAccounting=</varname> in
<citerefentry><refentrytitle>systemd-system.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>.</para> <citerefentry><refentrytitle>systemd-system.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>.</para>
<para>Under the unified cgroup hierarchy, CPU accounting is available for all units and this
setting has no effect.</para>
</listitem> </listitem>
</varlistentry> </varlistentry>

2
src/core/system.conf.in
View File

@ -51,7 +51,7 @@
#DefaultStartLimitIntervalSec=10s #DefaultStartLimitIntervalSec=10s
#DefaultStartLimitBurst=5 #DefaultStartLimitBurst=5
#DefaultEnvironment= #DefaultEnvironment=
#DefaultCPUAccounting=no #DefaultCPUAccounting=yes
#DefaultIOAccounting=no #DefaultIOAccounting=no
#DefaultIPAccounting=no #DefaultIPAccounting=no
#DefaultMemoryAccounting={{ 'yes' if MEMORY_ACCOUNTING_DEFAULT else 'no' }} #DefaultMemoryAccounting={{ 'yes' if MEMORY_ACCOUNTING_DEFAULT else 'no' }}