summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2017-08-29 16:51:27 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-08-30 11:14:26 +0100
commitb7bfbc18432c1e393a354c37ff970bfddb0e86cb (patch)
tree56085d684043a2246175854b77abcc29f2800034 /meta
parent437f14c14c3b231b07d6952174591c32bd962892 (diff)
downloadpoky-b7bfbc18432c1e393a354c37ff970bfddb0e86cb.tar.gz
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) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/lib/oeqa/utils/qemurunner.py12
1 files changed, 8 insertions, 4 deletions
diff --git a/meta/lib/oeqa/utils/qemurunner.py b/meta/lib/oeqa/utils/qemurunner.py
index cd60ba71a3..54312fb94c 100644
--- a/meta/lib/oeqa/utils/qemurunner.py
+++ b/meta/lib/oeqa/utils/qemurunner.py
@@ -55,7 +55,7 @@ class QemuRunner:
55 self.thread = None 55 self.thread = None
56 self.use_kvm = use_kvm 56 self.use_kvm = use_kvm
57 57
58 self.runqemutime = 60 58 self.runqemutime = 120
59 self.host_dumper = HostDumper(dump_host_cmds, dump_dir) 59 self.host_dumper = HostDumper(dump_host_cmds, dump_dir)
60 60
61 def create_socket(self): 61 def create_socket(self):
@@ -204,7 +204,7 @@ class QemuRunner:
204 out = self.getOutput(output) 204 out = self.getOutput(output)
205 netconf = False # network configuration is not required by default 205 netconf = False # network configuration is not required by default
206 if self.is_alive(): 206 if self.is_alive():
207 logger.info("qemu started - qemu procces pid is %s" % self.qemupid) 207 logger.info("qemu started in %s seconds - qemu procces pid is %s" % (time.time() - (endtime - self.runqemutime), self.qemupid))
208 if get_ip: 208 if get_ip:
209 cmdline = '' 209 cmdline = ''
210 with open('/proc/%s/cmdline' % self.qemupid) as p: 210 with open('/proc/%s/cmdline' % self.qemupid) as p:
@@ -317,10 +317,14 @@ class QemuRunner:
317 logger.info("Serial console failed while trying to login") 317 logger.info("Serial console failed while trying to login")
318 318
319 else: 319 else:
320 logger.info("Qemu pid didn't appeared in %s seconds" % self.runqemutime) 320 logger.error("Qemu pid didn't appear in %s seconds" % self.runqemutime)
321 self._dump_host() 321 self._dump_host()
322 self.stop() 322 self.stop()
323 logger.info("Output from runqemu:\n%s" % self.getOutput(output)) 323 op = self.getOutput(output)
324 if op:
325 logger.error("Output from runqemu:\n%s" % op)
326 else:
327 logger.error("No output from runqemu.\n")
324 return False 328 return False
325 329
326 return self.is_alive() 330 return self.is_alive()