Mirrors/criu
1
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu.git synced 2026-07-18 00:58:31 +00:00
Code Issues Projects Releases Wiki Activity

test/cgroup_yard: always clean up a test cgroup yard

Browse source 
Right now it is cleaned up from a post-restore hook,
but zdtm.py can be executed with the norst option:
$ zdtm.py run -t zdtm/static/cgroup_yard --norst
...
OSError: [Errno 17] File exists: 'external_yard'

Cc: Michał Cłapiński <mclapinski@google.com>
Signed-off-by: Andrei Vagin <avagin@gmail.com>
This commit is contained in:
Andrei Vagin 2019-09-15 11:49:27 -07:00
parent 813bfbeb4f
commit db40ef5be6
1 changed files with 10 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

39
test/zdtm/static/cgroup_yard.hook
View file

@ -12,6 +12,7 @@ if sys.argv[1] == "--pre-dump":
Create external cgroup yard to be passed to CRIU via --cgroup-yard
'''
os.mkdir(yard)
subprocess.check_call(["mount", "-t", "tmpfs", "zdtm_yard", yard])
with open("/proc/self/cgroup") as f:
for line in f:
cgr = line.split(":")[1]
@ -29,26 +30,6 @@ if sys.argv[1] == "--pre-dump":
os.mkdir(yard + "/" + ctrl)
subprocess.check_call(["mount", "-t", "cgroup", "none", yard + "/" + ctrl, "-o", opts])
if sys.argv[1] == "--post-restore":
'''
Clean up the cgroup yard created during `--pre-dump`
'''
with open("/proc/self/cgroup") as f:
for line in f:
cgr = line.split(":")[1]
if cgr == "":
continue
if cgr.startswith("name="):
ctrl = cgr[len("name="):]
else:
ctrl = cgr
subprocess.check_call(["umount", yard + "/" + ctrl])
os.rmdir(yard + "/" + ctrl)
os.rmdir(yard)
if sys.argv[1] in ["--pre-restore", "--clean"]:
'''
Clean up the leftover cgroups created by the test
@ -56,15 +37,15 @@ if sys.argv[1] in ["--pre-restore", "--clean"]:
tname = tempfile.mkdtemp()
subprocess.call(["mount", "-t", "cgroup", "none", tname, "-o", "none,name=zdtmtst"])
try:
os.rmdir(os.path.join(tname, "subcg00", "subsubcg"))
except:
pass
try:
os.rmdir(os.path.join(tname, "subcg00"))
except:
pass
for cg in [os.path.join(tname, "subcg00", "subsubcg"),
os.path.join(tname, "subcg00")]:
if os.access(cg, os.F_OK):
os.rmdir(cg)
subprocess.call(["umount", tname])
os.rmdir(tname)
if sys.argv[1] == "--clean":
if os.access(yard, os.F_OK):
subprocess.call(["umount", "-l", yard])
os.rmdir(yard)