chiark / gitweb /
tests: when running a manager object in a test, migrate to private cgroup subroot...
authorLennart Poettering <lennart@poettering.net>
Wed, 9 Aug 2017 13:42:49 +0000 (15:42 +0200)
committerSven Eden <yamakuzure@gmx.net>
Thu, 10 Aug 2017 08:29:08 +0000 (10:29 +0200)
Without this "meson test" will end up running all tests in the same
cgroup root, and they all will try to manage it. Which usually isn't too
bad, except when they end up clearing up each other's cgroups. This race
is hard to trigger but has caused various CI runs to fail spuriously.

With this change we simply move every test that runs a manager object
into their own private cgroup. Note that we don't clean up the cgroup at
the end, we leave that to the cgroup manager around it.

This fixes races that become visible by test runs throwing out errors
like this:

```
exec-systemcallfilter-failing.service: Passing 0 fds to service
exec-systemcallfilter-failing.service: About to execute: /bin/echo 'This should not be seen'
exec-systemcallfilter-failing.service: Forked /bin/echo as 5693
exec-systemcallfilter-failing.service: Changed dead -> start
exec-systemcallfilter-failing.service: Failed to attach to cgroup /exec-systemcallfilter-failing.service: No such file or directory
Received SIGCHLD from PID 5693 ((echo)).
Child 5693 ((echo)) died (code=exited, status=219/CGROUP)
exec-systemcallfilter-failing.service: Child 5693 belongs to exec-systemcallfilter-failing.service
exec-systemcallfilter-failing.service: Main process exited, code=exited, status=219/CGROUP
exec-systemcallfilter-failing.service: Changed start -> failed
exec-systemcallfilter-failing.service: Unit entered failed state.
exec-systemcallfilter-failing.service: Failed with result 'exit-code'.
exec-systemcallfilter-failing.service: cgroup is empty
Assertion 'service->main_exec_status.status == status_expected' failed at ../src/src/test/test-execute.c:71, function check(). Aborting.
```

BTW, I tracked this race down by using perf:

```
        # perf record -e cgroup:cgroup_mkdir,cgroup_rmdir
        …
        # perf script
```

Thanks a lot @iaguis, @alban for helping me how to use perf for this.

Fixes #5895.

src/test/meson.build

index b341a0b1ff99332cb8f62c15496b6f347a7198a0..425c53f8333b9622e5680cacbcc9fd874f4a35a9 100644 (file)
@@ -495,7 +495,8 @@ tests += [
 
 
 #if 0 /// UNNEEDED in elogind
-#         [['src/test/test-cgroup-mask.c'],
+#         [['src/test/test-cgroup-mask.c',
+#           'src/test/test-helper.c'],
 #          [libcore,
 #           libshared],
 #          [threads,
@@ -527,7 +528,8 @@ tests += [
          []],
 
 #if 0 /// UNNEEDED in elogind
-#         [['src/test/test-path.c'],
+#         [['src/test/test-path.c',
+#           'src/test/test-helper.c'],
 #          [libcore,
 #           libshared],
 #          [threads,