[CRIU] [PATCH] zdtm/cgroup02: fix test using ropts instead of opts

Pavel Tikhomirov ptikhomirov at virtuozzo.com
Mon Sep 19 01:33:29 PDT 2016


In commit 07d259f365f2 ("cgroup: support --cgroup-root on dump too")
criu starts to understand --cgroup-root option on dump, but our
cgroup02 test in cgroup02.desc file sets these opt to /newroot
unintentionaly, as on dump we don't have /newroot dump fails:

https://ci.openvz.org/job/CRIU/job/CRIU-x86_64/branch/criu-dev/989

======================== Run zdtm/static/cgroup02 in h
=========================
Start test
Test is SUID
./cgroup02 --pidfile=cgroup02.pid --outfile=cgroup02.out
--dirname=cgroup02.test
Run criu dump
=[log]=> dump/zdtm/static/cgroup02/30/1/dump.log
------------------------ grep Error ------------------------
(00.023103) Error (criu/cgroup.c:620): cg: failed walking
/proc/self/fd/10/newroot for empty cgroups: No such file or directory
(00.023129) Error (criu/cr-dump.c:1359): Dump core (pid: 30) failed with
-1
(00.023944) Error (criu/cr-dump.c:1675): Dumping FAILED.
------------------------ ERROR OVER ------------------------

So fix this by using restore-only ropts instead of opts.

Signed-off-by: Pavel Tikhomirov <ptikhomirov at virtuozzo.com>
---
 test/zdtm/static/cgroup02.desc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/zdtm/static/cgroup02.desc b/test/zdtm/static/cgroup02.desc
index 4999d91..9e17233 100644
--- a/test/zdtm/static/cgroup02.desc
+++ b/test/zdtm/static/cgroup02.desc
@@ -1 +1 @@
-{'flavor': 'h', 'flags': 'suid', 'opts': '--manage-cgroups --cgroup-root /newroot --cgroup-root name=zdtmtst:/zdtmtstroot'}
+{'flavor': 'h', 'flags': 'suid', 'ropts': '--manage-cgroups --cgroup-root /newroot --cgroup-root name=zdtmtst:/zdtmtstroot'}
-- 
2.5.5



More information about the CRIU mailing list