Merge lp:~lifeless/launchpad/oops into lp:launchpad
Status: | Merged | ||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|
Approved by: | Michael Hudson-Doyle | ||||||||||||
Approved revision: | no longer in the source branch. | ||||||||||||
Merged at revision: | 11508 | ||||||||||||
Proposed branch: | lp:~lifeless/launchpad/oops | ||||||||||||
Merge into: | lp:launchpad | ||||||||||||
Diff against target: |
370 lines (+122/-28) 9 files modified
lib/canonical/launchpad/doc/librarian.txt (+19/-0) lib/canonical/launchpad/webapp/errorlog.py (+5/-1) lib/canonical/librarian/client.py (+26/-7) lib/canonical/librarian/ftests/test_client.py (+3/-2) lib/lp/services/mail/sendmail.py (+20/-6) lib/lp/services/mail/tests/test_sendmail.py (+0/-4) lib/lp/services/memcache/client.py (+26/-1) lib/lp/services/memcache/tests/test_memcache_client.py (+19/-6) lib/lp/testing/tests/test_testcase.py (+4/-1) |
||||||||||||
To merge this branch: | bzr merge lp:~lifeless/launchpad/oops | ||||||||||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Graham Binns (community) | release-critical | Approve | |
Michael Hudson-Doyle | Approve | ||
Review via email: mp+34600@code.launchpad.net |
Commit message
Record more data in the request timeline: email sending, librarian client downloads, and memcache get/sets.
Description of the change
Record several blocking activities in the request timeline:
- sending email
- downloading from the librarian
- set and get on memcache
This will shed some light on 'high python time oopses' that may be doing blocking actions.
Implementation wise, the librarian and memcache parts are tested. The Right Place to hook in - raw_sendmail - isn't tested at all in Launchpad, and I'm not sure how to test it either and its dealing with the internals of Utilities.
I think that this is either going to work well or blow up very very quickly though, so I'm fairly comfortable landing it and seeing how much of staging it demolishes.
I'm running it through ec2 test to catch advance issues now.
This will need an RC stamp to actually land, but given the huge increase in visibility I hope it adds, that should be a no-bwainer.
This all looks fine. I like the new API! And I'm sure the information will be really useful.
I worry a bit about tests that don't have a participation when they try to access the database, but well you'll find out about that :-) I think the scripts should all be fine (execute_ zcml_for_ scripts( ) calls login(ANONYMOUS) iirc).