Merge lp:~michael.nelson/launchpad/fix-buildd-slave-test into lp:launchpad
| Status: | Merged |
|---|---|
| Approved by: | Michael Nelson |
| Approved revision: | no longer in the source branch. |
| Merged at revision: | not available |
| Proposed branch: | lp:~michael.nelson/launchpad/fix-buildd-slave-test |
| Merge into: | lp:launchpad |
| Diff against target: |
17 lines (+4/-3) 1 file modified
lib/canonical/launchpad/daemons/tachandler.py (+4/-3) |
| To merge this branch: | bzr merge lp:~michael.nelson/launchpad/fix-buildd-slave-test |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Eleanor Berger (community) | code | Approve | |
|
Review via email:
|
|||
Commit message
Don't swallow all OSError exceptions during two_stage_kill.
Description of the change
Recently I've seen a failure during ec2 test (and hence didn't land my branch) which today also appeared on buildbot:
https:/
It seems that the recently updated two_stage_kill is returning before the process has terminated, and terminates instead during the s.info() call, which triggers the connection reset.
The recent changes to two_stage_kill can be seen here:
https:/
although I don't see any behaviour change.
I can force the error as in the test failure by doing:
http://
Pre-imp. with jml:
http://
As I don't know what exception might be being raised, I'm not sure how it can be tested (other than the current test-suite still passing).
| Eleanor Berger (intellectronica) | # |
