From 8f35c388b443d4d820af703d53269a81e11007a3 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 29 Aug 2017 16:51:27 +0100 Subject: [PATCH] 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 Signed-off-by: Armin Kuster Signed-off-by: Richard Purdie --- meta/lib/oeqa/utils/qemurunner.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/meta/lib/oeqa/utils/qemurunner.py b/meta/lib/oeqa/utils/qemurunner.py index ba44b96f53..1b8cbce477 100644 --- a/meta/lib/oeqa/utils/qemurunner.py +++ b/meta/lib/oeqa/utils/qemurunner.py @@ -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()