public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #66984 from flokli/systemd-cgroup-accounting

Browse Source 
nixos/systemd: enable systemd cgroup accounting by default
This commit is contained in:
Florian Klink 2019-08-27 11:38:28 +02:00 committed by GitHub
commit 9a02d9c75e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
nixos/doc/manual/release-notes/rl-1909.xml
View File

@ -506,12 +506,20 @@
been removed. been removed.
</para> </para>
</listitem> </listitem>
<listitem> <listitem>
<para> <para>
The <literal>rmilter</literal> package was removed with associated module and options due deprecation by upstream developer. The <literal>rmilter</literal> package was removed with associated module and options due deprecation by upstream developer.
Use <literal>rspamd</literal> in proxy mode instead. Use <literal>rspamd</literal> in proxy mode instead.
</para> </para>
</listitem> </listitem>
<listitem>
<para>
systemd cgroup accounting via the
<link linkend="opt-systemd.enableCgroupAccounting">systemd.enableCgroupAccounting</link>
option is now enabled by default. It now also enables the more recent Block IO and IP accounting
features.
</para>
</listitem>
</itemizedlist> </itemizedlist>
</section> </section>
</section> </section>

6
nixos/modules/system/boot/systemd.nix
View File

@ -537,7 +537,7 @@ in
}; };
systemd.enableCgroupAccounting = mkOption { systemd.enableCgroupAccounting = mkOption {
default = false; default = true;
type = types.bool; type = types.bool;
description = '' description = ''
Whether to enable cgroup accounting. Whether to enable cgroup accounting.
@ -804,10 +804,10 @@ in
[Manager] [Manager]
${optionalString config.systemd.enableCgroupAccounting '' ${optionalString config.systemd.enableCgroupAccounting ''
DefaultCPUAccounting=yes DefaultCPUAccounting=yes
DefaultBlockIOAccounting=yes
DefaultIOAccounting=yes DefaultIOAccounting=yes
DefaultBlockIOAccounting=yes DefaultBlockIOAccounting=yes
DefaultMemoryAccounting=yes DefaultIPAccounting=yes
DefaultTasksAccounting=yes
''} ''}
DefaultLimitCORE=infinity DefaultLimitCORE=infinity
${config.systemd.extraConfig} ${config.systemd.extraConfig}

7
nixos/tests/systemd.nix
View File

@ -89,5 +89,12 @@ import ./make-test.nix ({ pkgs, ... }: {
$machine->waitForUnit('multi-user.target'); $machine->waitForUnit('multi-user.target');
$machine->succeed('sysctl net.core.default_qdisc | grep -q "fq_codel"'); $machine->succeed('sysctl net.core.default_qdisc | grep -q "fq_codel"');
}; };
# Test cgroup accounting is enabled
subtest "systemd cgroup accounting is enabled", sub {
$machine->waitForUnit('multi-user.target');
$machine->succeed('systemctl show testservice1.service -p IOAccounting | grep -q "yes"');
$machine->succeed('systemctl status testservice1.service | grep -q "CPU:"');
};
''; '';
}) })