diff options
author | Lennart Poettering <lennart@poettering.net> | 2013-09-26 22:49:44 +0200 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2013-09-26 22:57:43 +0200 |
commit | 7ac807320a7416463d7ff3ef6ede574863a601c5 (patch) | |
tree | 60c9cc78d5883d35c23763743e961bca0f305212 /man/systemd-cgtop.xml | |
parent | c68ba912c347a79885bb0e863034bdb3a8ae057e (diff) | |
download | systemd-7ac807320a7416463d7ff3ef6ede574863a601c5.tar.gz |
core: drop some out-of-date references to cgroup settings
Diffstat (limited to 'man/systemd-cgtop.xml')
-rw-r--r-- | man/systemd-cgtop.xml | 36 |
1 files changed, 15 insertions, 21 deletions
diff --git a/man/systemd-cgtop.xml b/man/systemd-cgtop.xml index 0e9e5e611a..51549c4ac2 100644 --- a/man/systemd-cgtop.xml +++ b/man/systemd-cgtop.xml @@ -73,30 +73,23 @@ only accounted for control groups in the <literal>cpuacct</literal> hierarchy, memory usage only for those in <literal>memory</literal> and disk - I/O usage for those in - <literal>blkio</literal>. <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry> - by default places all services in their own control - group in the <literal>cpuacct</literal> hierarchy, but - not in <literal>memory</literal> nor - <literal>blkio</literal>. If resource monitoring for - these resources is required, it is recommended to add - <literal>blkio</literal> and <literal>memory</literal> - to the <varname>DefaultControllers=</varname> setting - in <filename>/etc/systemd/system.conf</filename> (see - <citerefentry><refentrytitle>systemd-system.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry> - for details). Alternatively, it is possible to enable - resource accounting individually for services, by - making use of the <varname>ControlGroup=</varname> - option in the unit files (See - <citerefentry><refentrytitle>systemd.exec</refentrytitle><manvolnum>5</manvolnum></citerefentry> + I/O usage for those in <literal>blkio</literal>. If + resource monitoring for these resources is required, + it is recommended to add the + <varname>CPUAccounting=1</varname>, + <varname>MemoryAccounting=1</varname> and + <varname>BlockIOAccounting=1</varname> settings in the + unit files in question (See + <citerefentry><refentrytitle>systemd.cgroup</refentrytitle><manvolnum>5</manvolnum></citerefentry> for details).</para> <para>To emphasize this: unless - <literal>blkio</literal> and <literal>memory</literal> - are enabled for the services in question with either - of the options suggested above no resource accounting - will be available for system services and the data shown - by <command>systemd-cgtop</command> will be + <literal>CPUAccounting=1</literal>, + <literal>MemoryAccounting=1</literal> and + <literal>BlockIOAccounting=1</literal> are enabled for + the services in question no resource accounting will + be available for system services and the data shown by + <command>systemd-cgtop</command> will be incomplete.</para> </refsect1> @@ -281,6 +274,7 @@ <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>systemctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>systemd-cgls</refentrytitle><manvolnum>1</manvolnum></citerefentry>, + <citerefentry><refentrytitle>systemd.cgroup</refentrytitle><manvolnum>5</manvolnum></citerefentry>, <citerefentry><refentrytitle>top</refentrytitle><manvolnum>1</manvolnum></citerefentry> </para> </refsect1> |