picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #16074 from msekletar/freezer-test-flakes 

Freezer test flakes
This commit is contained in:
Lennart Poettering 2020-06-09 14:38:40 +02:00 committed by GitHub
parent 8b8ae7959d 2884836e3c
commit 57b611a5bf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/slice.c
View File

@ -403,7 +403,7 @@ static int slice_freezer_action(Unit *s, FreezerAction action) {
if (r < 0)
return r;
return 0;
return 1;
}
static int slice_freeze(Unit *s) {

4
test/units/testsuite-38.sh
View File

@ -246,6 +246,8 @@ test_preserve_state() {
echo -n " - freeze from outside: "
echo 1 > /sys/fs/cgroup/"${slice}"/cgroup.freeze
# Give kernel some time to freeze the slice
sleep 1
# Our state should not be affected
check_freezer_state "${slice}" "running"
@ -258,6 +260,8 @@ test_preserve_state() {
echo -n " - thaw from outside: "
echo 0 > /sys/fs/cgroup/"${slice}"/cgroup.freeze
sleep 1
check_freezer_state "${unit}" "running"
check_freezer_state "${slice}" "running"
grep -q "frozen 0" /sys/fs/cgroup/"${slice}"/cgroup.events