summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2017-08-29 16:51:27 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-03-04 11:11:58 +0000
commit8f35c388b443d4d820af703d53269a81e11007a3 (patch)
tree7a35a870ae80a507d915b17dc7fa94bfd061efea
parentdd44b2c92f40d0b010336c8af8ea337763e55cf9 (diff)
downloadpoky-8f35c388b443d4d820af703d53269a81e11007a3.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) (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>
-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 ba44b96f53..1b8cbce477 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):
@@ -203,7 +203,7 @@ class QemuRunner:
203 out = self.getOutput(output) 203 out = self.getOutput(output)
204 netconf = False # network configuration is not required by default 204 netconf = False # network configuration is not required by default
205 if self.is_alive(): 205 if self.is_alive():
206 logger.info("qemu started - qemu procces pid is %s" % self.qemupid) 206 logger.info("qemu started in %s seconds - qemu procces pid is %s" % (time.time() - (endtime - self.runqemutime), self.qemupid))
207 if get_ip: 207 if get_ip:
208 cmdline = '' 208 cmdline = ''
209 with open('/proc/%s/cmdline' % self.qemupid) as p: 209 with open('/proc/%s/cmdline' % self.qemupid) as p:
@@ -316,10 +316,14 @@ class QemuRunner:
316 logger.info("Serial console failed while trying to login") 316 logger.info("Serial console failed while trying to login")
317 317
318 else: 318 else:
319 logger.info("Qemu pid didn't appeared in %s seconds" % self.runqemutime) 319 logger.error("Qemu pid didn't appear in %s seconds" % self.runqemutime)
320 self._dump_host() 320 self._dump_host()
321 self.stop() 321 self.stop()
322 logger.info("Output from runqemu:\n%s" % self.getOutput(output)) 322 op = self.getOutput(output)
323 if op:
324 logger.error("Output from runqemu:\n%s" % op)
325 else:
326 logger.error("No output from runqemu.\n")
323 return False 327 return False
324 328
325 return self.is_alive() 329 return self.is_alive()