Merge lp:~mterry/qtmir/longer-timeout into lp:qtmir

[Michael Terry]

Wait longer for Mir to start up.

Sometimes Mir will legitimately wait for longer than 10s during startup. In particular, it will wait up to 30s for /dev/random to provide enough randomness for Mir's internal cookies.

In the situation where it waits for /dev/random, if qtmir bails at 10s, there is no output generated about why Mir was taking so long, and it is very frustrating to debug.

Wait longer for Mir to start up.

Waiting only 10s bit Josh and I real bad. Sometimes Mir will legitimately wait for longer than 10s during startup. In particular, it will wait up to 30s for /dev/random to provide enough randomness for Mir's internal cookies.

In the situation where it waits for /dev/random, if qtmir bails at 10s, there is no output generated about why Mir was taking so long, and it is very frustrating to debug.

Is there any reason bumping the timeout would be harmful?

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:435
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-1-ci/28/
Executed test runs:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-1-ci/28/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:435
http://jenkins.qa.ubuntu.com/job/qtmir-ci/652/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-amd64-ci/346
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-armhf-ci/348
        deb: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-armhf-ci/348/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-i386-ci/228
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-amd64-ci/383/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-armhf-ci/385/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-i386-ci/228/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtmir-ci/652/rebuild

review: Needs Fixing (continuous-integration)

[Gerry Boland (gerboland)]

If Mir takes more than a few seconds to start up, that's a problem Mir has to fix. There is no way I would allow Mir 59 seconds to start up correctly and consider it correct behaviour.

review: Disapprove

Unmerged revisions

435. By Michael Terry on 2016-01-20

Wait longer for mir server

=== modified file 'src/platforms/mirserver/qmirserver_p.cpp'
--- src/platforms/mirserver/qmirserver_p.cpp	2015-05-18 18:46:42 +0000
+++ src/platforms/mirserver/qmirserver_p.cpp	2016-01-20 20:25:22 +0000
@@ -48,6 +48,6 @@
 bool MirServerThread::waitForMirStartup()
 {
     std::unique_lock<decltype(mutex)> lock(mutex);
-    started_cv.wait_for(lock, std::chrono::seconds{10}, [&]{ return mir_running; });
+    started_cv.wait_for(lock, std::chrono::seconds{60}, [&]{ return mir_running; });
     return mir_running;
 }