Commit 6110ce00 authored by Andrei Vagin's avatar Andrei Vagin

zdtm.py: use --status-fd instead of --daemon for lazy stuff

It works faster and allows to check exit codes.

travis-ci: success for series starting with [1/2] page-server: don't return a server pid from page-server
Signed-off-by: 's avatarAndrei Vagin <avagin@virtuozzo.com>
Signed-off-by: 's avatarPavel Emelyanov <xemul@virtuozzo.com>
parent f75db3cd
...@@ -793,8 +793,7 @@ class criu: ...@@ -793,8 +793,7 @@ class criu:
self.__page_server_p = None self.__page_server_p = None
def fini(self, opts): def fini(self, opts):
if self.__lazy_pages: return
wait_pid_die(int(rpidfile(self.__ddir() + "/lp.pid")), "lazy-pages")
def logs(self): def logs(self):
return self.__dump_path return self.__dump_path
...@@ -969,12 +968,12 @@ class criu: ...@@ -969,12 +968,12 @@ class criu:
r_opts.append('mnt[zdtm]:%s' % criu_dir) r_opts.append('mnt[zdtm]:%s' % criu_dir)
if self.__lazy_pages: if self.__lazy_pages:
lp_opts = ["--daemon", "--pidfile", "lp.pid"] lp_opts = []
if self.__remote_lazy_pages: if self.__remote_lazy_pages:
lp_opts += ['--page-server', "--port", "12345"] lp_opts += ['--page-server', "--port", "12345"]
ps_opts = ["--daemon", "--pidfile", "ps.pid", ps_opts = ["--pidfile", "ps.pid",
"--port", "12345", "--lazy-pages"] "--port", "12345", "--lazy-pages"]
self.__criu_act("page-server", opts = ps_opts) self.__page_server_p = self.__criu_act("page-server", opts = ps_opts, nowait = True)
self.__lazy_pages_p = self.__criu_act("lazy-pages", opts = lp_opts, nowait = True) self.__lazy_pages_p = self.__criu_act("lazy-pages", opts = lp_opts, nowait = True)
r_opts += ["--lazy-pages"] r_opts += ["--lazy-pages"]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment