Merge pull request #16074 from msekletar/freezer-test-flakes
Freezer test flakes
This commit is contained in:
commit
57b611a5bf
|
@ -403,7 +403,7 @@ static int slice_freezer_action(Unit *s, FreezerAction action) {
|
||||||
if (r < 0)
|
if (r < 0)
|
||||||
return r;
|
return r;
|
||||||
|
|
||||||
return 0;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int slice_freeze(Unit *s) {
|
static int slice_freeze(Unit *s) {
|
||||||
|
|
|
@ -246,6 +246,8 @@ test_preserve_state() {
|
||||||
|
|
||||||
echo -n " - freeze from outside: "
|
echo -n " - freeze from outside: "
|
||||||
echo 1 > /sys/fs/cgroup/"${slice}"/cgroup.freeze
|
echo 1 > /sys/fs/cgroup/"${slice}"/cgroup.freeze
|
||||||
|
# Give kernel some time to freeze the slice
|
||||||
|
sleep 1
|
||||||
|
|
||||||
# Our state should not be affected
|
# Our state should not be affected
|
||||||
check_freezer_state "${slice}" "running"
|
check_freezer_state "${slice}" "running"
|
||||||
|
@ -258,6 +260,8 @@ test_preserve_state() {
|
||||||
|
|
||||||
echo -n " - thaw from outside: "
|
echo -n " - thaw from outside: "
|
||||||
echo 0 > /sys/fs/cgroup/"${slice}"/cgroup.freeze
|
echo 0 > /sys/fs/cgroup/"${slice}"/cgroup.freeze
|
||||||
|
sleep 1
|
||||||
|
|
||||||
check_freezer_state "${unit}" "running"
|
check_freezer_state "${unit}" "running"
|
||||||
check_freezer_state "${slice}" "running"
|
check_freezer_state "${slice}" "running"
|
||||||
grep -q "frozen 0" /sys/fs/cgroup/"${slice}"/cgroup.events
|
grep -q "frozen 0" /sys/fs/cgroup/"${slice}"/cgroup.events
|
||||||
|
|
Loading…
Reference in a new issue