qemurunner: Tweak qemu pid starting timeout code

We're seeing timeouts in the autobuilder testing code. Increase these
timeouts to 120, print the length of time we're having to wait, change
the error messages to really be errors and don't print empty logs, its
not helpful, print a message about the empty log instead.

(From OE-Core rev: b87a33d9c86cc1d2ea196259020e1d3dc712ccef)

(From OE-Core rev: 4234ea8aae52347e49f848292deb0936ffd905ae)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie 2017-08-29 16:51:27 +01:00
parent dd44b2c92f
commit 8f35c388b4
1 changed files with 8 additions and 4 deletions

View File

@ -55,7 +55,7 @@ class QemuRunner:
self.thread = None
self.use_kvm = use_kvm
self.runqemutime = 60
self.runqemutime = 120
self.host_dumper = HostDumper(dump_host_cmds, dump_dir)
def create_socket(self):
@ -203,7 +203,7 @@ class QemuRunner:
out = self.getOutput(output)
netconf = False # network configuration is not required by default
if self.is_alive():
logger.info("qemu started - qemu procces pid is %s" % self.qemupid)
logger.info("qemu started in %s seconds - qemu procces pid is %s" % (time.time() - (endtime - self.runqemutime), self.qemupid))
if get_ip:
cmdline = ''
with open('/proc/%s/cmdline' % self.qemupid) as p:
@ -316,10 +316,14 @@ class QemuRunner:
logger.info("Serial console failed while trying to login")
else:
logger.info("Qemu pid didn't appeared in %s seconds" % self.runqemutime)
logger.error("Qemu pid didn't appear in %s seconds" % self.runqemutime)
self._dump_host()
self.stop()
logger.info("Output from runqemu:\n%s" % self.getOutput(output))
op = self.getOutput(output)
if op:
logger.error("Output from runqemu:\n%s" % op)
else:
logger.error("No output from runqemu.\n")
return False
return self.is_alive()