Commit 638c14f2 authored by root's avatar root Committed by Andrei Vagin

zdtm: grep errors from page-server.log and lazy-pages.log

This can help to investigate logs from Mr Jenkins.

Cc: Mike Rapoport <rppt@linux.vnet.ibm.com>
Signed-off-by: 's avatarAndrei Vagin <avagin@openvz.org>
Signed-off-by: 's avatarAndrei Vagin <avagin@virtuozzo.com>
parent e6537f3d
...@@ -834,11 +834,13 @@ class criu: ...@@ -834,11 +834,13 @@ class criu:
def fini(self): def fini(self):
if self.__lazy_pages_p: if self.__lazy_pages_p:
ret = self.__lazy_pages_p.wait() ret = self.__lazy_pages_p.wait()
grep_errors(os.path.join(self.__ddir(), "lazy-pages.log"))
self.__lazy_pages_p = None self.__lazy_pages_p = None
if ret: if ret:
raise test_fail_exc("criu lazy-pages exited with %s" % ret) raise test_fail_exc("criu lazy-pages exited with %s" % ret)
if self.__page_server_p: if self.__page_server_p:
ret = self.__page_server_p.wait() ret = self.__page_server_p.wait()
grep_errors(os.path.join(self.__ddir(), "page-server.log"))
self.__page_server_p = None self.__page_server_p = None
if ret: if ret:
raise test_fail_exc("criu page-server exited with %s" % ret) raise test_fail_exc("criu page-server exited with %s" % ret)
...@@ -1003,6 +1005,7 @@ class criu: ...@@ -1003,6 +1005,7 @@ class criu:
if self.__page_server_p: if self.__page_server_p:
ret = self.__page_server_p.wait() ret = self.__page_server_p.wait()
grep_errors(os.path.join(self.__ddir(), "page-server.log"))
self.__page_server_p = None self.__page_server_p = None
if ret: if ret:
raise test_fail_exc("criu page-server exited with %d" % ret) raise test_fail_exc("criu page-server exited with %d" % ret)
...@@ -1060,10 +1063,12 @@ class criu: ...@@ -1060,10 +1063,12 @@ class criu:
if self.__lazy_pages_p: if self.__lazy_pages_p:
self.__lazy_pages_p.terminate() self.__lazy_pages_p.terminate()
print "criu lazy-pages exited with %s" % self.__lazy_pages_p.wait() print "criu lazy-pages exited with %s" % self.__lazy_pages_p.wait()
grep_errors(os.path.join(self.__ddir(), "lazy-pages.log"))
self.__lazy_pages_p = None self.__lazy_pages_p = None
if self.__page_server_p: if self.__page_server_p:
self.__page_server_p.terminate() self.__page_server_p.terminate()
print "criu page-server exited with %s" % self.__page_server_p.wait() print "criu page-server exited with %s" % self.__page_server_p.wait()
grep_errors(os.path.join(self.__ddir(), "page-server.log"))
self.__page_server_p = None self.__page_server_p = None
......
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