Merge lp:~mir-team/mir/lazy-cookie-secret-creation into lp:mir
Status: | Work in progress |
---|---|
Proposed branch: | lp:~mir-team/mir/lazy-cookie-secret-creation |
Merge into: | lp:mir |
Diff against target: |
88 lines (+20/-9) 3 files modified
src/cookie/authority.cpp (+18/-7) tests/acceptance-tests/test_server_startup.cpp (+1/-1) tests/unit-tests/test_mir_cookie.cpp (+1/-1) |
To merge this branch: | bzr merge lp:~mir-team/mir/lazy-cookie-secret-creation |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Daniel van Vugt | Disapprove | ||
Mir CI Bot | continuous-integration | Needs Fixing | |
Cemil Azizoglu (community) | Needs Fixing | ||
Review via email:
|
Commit message
Delay creating the secret so we dont block on /dev/random on boot.
Description of the change
Delay creating the secret so we dont block on /dev/random on boot.
Tested by:
You can check the entropy pool:
watch -n 0.1 cat /proc/sys/
PrePatch (ie. bug)
In a ssh session or tty1 "cat /dev/random" // eats up all the entropy
log into unity8 (Black screen and nothing!)
With this patch:
cat /dev/random again
log into unity8 (while smashing on the keys/mouse to attempt to get the secret created)
login works!
Note there was also discussion to remove create_saving, which we can remove. Just wanted to create this quick fix with out breaking API/ABI of the libcookie. Ill be creating a branch soon to remove that create function + a function that returns the secret.
Unmerged revisions
- 3348. By Brandon Schaefer
-
* Fix throw
- 3347. By Brandon Schaefer
-
* Enable the regession tests
- 3346. By Brandon Schaefer
-
* Delay making the secret if no one wants one right away
PASSED: Continuous integration, rev:3346 /mir-jenkins. ubuntu. com/job/ mir-ci/ 424/ /mir-jenkins. ubuntu. com/job/ build-mir/ 231 /mir-jenkins. ubuntu. com/job/ build-0- fetch/255 /mir-jenkins. ubuntu. com/job/ build-1- sourcepkg/ release= vivid+overlay/ 247 /mir-jenkins. ubuntu. com/job/ build-1- sourcepkg/ release= xenial/ 247 /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= amd64,compiler= clang,platform= mesa,release= vivid+overlay/ 238 /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= amd64,compiler= clang,platform= mesa,release= vivid+overlay/ 238/artifact/ output/ *zip*/output. zip /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= amd64,compiler= gcc,platform= mesa,release= xenial/ 238 /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= amd64,compiler= gcc,platform= mesa,release= xenial/ 238/artifact/ output/ *zip*/output. zip /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= cross-armhf, compiler= gcc,platform= android, release= vivid+overlay/ 238 /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= cross-armhf, compiler= gcc,platform= android, release= vivid+overlay/ 238/artifact/ output/ *zip*/output. zip /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= i386,compiler= gcc,platform= android, release= vivid+overlay/ 238 /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= i386,compiler= gcc,platform= android, release= vivid+overlay/ 238/artifact/ output/ *zip*/output. zip /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= i386,compiler= gcc,platform= mesa,release= xenial/ 238 /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= i386,compiler= gcc,platform= mesa,release= xenial/ 238/artifact/ output/ *zip*/output. zip
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild: /mir-jenkins. ubuntu. com/job/ mir-ci/ 424/rebuild
https:/