Merge lp:~mars/launchpad/fix-ec2-shutdown-617598 into lp:launchpad
Status: | Merged |
---|---|
Approved by: | Māris Fogels |
Approved revision: | no longer in the source branch. |
Merged at revision: | 11347 |
Proposed branch: | lp:~mars/launchpad/fix-ec2-shutdown-617598 |
Merge into: | lp:launchpad |
Diff against target: |
36 lines (+13/-2) 2 files modified
lib/devscripts/ec2test/builtins.py (+1/-1) lib/devscripts/ec2test/testrunner.py (+12/-1) |
To merge this branch: | bzr merge lp:~mars/launchpad/fix-ec2-shutdown-617598 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Guilherme Salgado (community) | Approve | ||
Review via email: mp+32633@code.launchpad.net |
Commit message
Backed out r11224. Fixes a problem where EC2 instances where only shutting down after a full 8 hours. Dropped the EC2 failsafe timeout to 5 hours from 8.
Description of the change
Hi,
This branch fixes a problem with competing shutdown calls in the ec2 testrunner stepping on each other's toes, causing the instance to keep running for a full 8 hours. See bug 617598 for details.
On salgado's advice this backs out the failsafe shutdown code just in case someone else writes a shutdown call somewhere in the future and encounters this same problem. I backed out r11224 of devel in it's entirety.
While making the fix I dropped the failsafe timeout from 8 hours to 5. The suite runs inside four hours, so this should not be a problem.
I will run 'ec2 land' in order to test this change.
Maris
That's the code we had before! I think it's well worth adding to the comment, explaining why we are using 'at' rather than giving a time to 'shutdown'.