summaryrefslogtreecommitdiff
path: root/man/systemd-system.conf.xml
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2018-02-09 19:59:53 +0100
committerLennart Poettering <lennart@poettering.net>2018-02-09 20:06:33 +0100
commite0c46a736412b79b94a21f8512a769b9212b9adf (patch)
tree12517ee34697706b297736d0d371dae24c1f2756 /man/systemd-system.conf.xml
parentcadc80b873794e52cb73235e8c0a03fe665d64af (diff)
downloadsystemd-e0c46a736412b79b94a21f8512a769b9212b9adf.tar.gz
pid1: turn memory accounting on by default now
After discussions with @htejun it appears it's OK now to enable memory accounting by default for all units without affecting system performance too badly. facebook has made good experiences with deploying memory accounting across their infrastructure. This hence turns MemoryAccounting= from opt-in to opt-out, similar to how TasksAccounting= is already handled. The other accounting options remain off, their performance impact is too big still.
Diffstat (limited to 'man/systemd-system.conf.xml')
-rw-r--r--man/systemd-system.conf.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/man/systemd-system.conf.xml b/man/systemd-system.conf.xml
index 08f6c91901..d875a3c46f 100644
--- a/man/systemd-system.conf.xml
+++ b/man/systemd-system.conf.xml
@@ -338,8 +338,8 @@
<varname>CPUAccounting=</varname>, <varname>BlockIOAccounting=</varname>, <varname>MemoryAccounting=</varname>,
<varname>TasksAccounting=</varname> and <varname>IPAccounting=</varname>. See
<citerefentry><refentrytitle>systemd.resource-control</refentrytitle><manvolnum>5</manvolnum></citerefentry>
- for details on the per-unit settings. <varname>DefaultTasksAccounting=</varname> defaults to on, the other
- four settings to off.</para></listitem>
+ for details on the per-unit settings. <varname>DefaultTasksAccounting=</varname> and
+ <varname>DefaultMemoryAccounting=</varname> default to on, the other three settings to off.</para></listitem>
</varlistentry>
<varlistentry>