Launchpad itself

Merge lp://staging/~mbp/launchpad/ec2-region into lp://staging/launchpad

ec2-region
Merge into devel

Proposed by Martin Pool on 2011-11-17

Status:	Merged
Approved by:	Martin Pool on 2011-11-17
Approved revision:	no longer in the source branch.
Merged at revision:	14347
Proposed branch:	lp://staging/~mbp/launchpad/ec2-region
Merge into:	lp://staging/launchpad
Diff against target:	577 lines (+136/-77) 5 files modified lib/devscripts/ec2test/builtins.py (+36/-21) lib/devscripts/ec2test/credentials.py (+11/-5) lib/devscripts/ec2test/instance.py (+71/-47) lib/devscripts/ec2test/testrunner.py (+15/-3) lib/devscripts/ec2test/tests/test_ec2instance.py (+3/-1)
To merge this branch:	bzr merge lp://staging/~mbp/launchpad/ec2-region
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Michael Hudson-Doyle		2011-11-17	Approve on 2011-11-17
Review via email: mp+82487@code.staging.launchpad.net

This proposal supersedes a proposal from 2011-11-16.

Commit message

[r=mwhudson][no-qa] ec2test: add --region option; move some files to tmpfs; be more robust

Description of the change

This adds a --region option to ec2, so that if you live in the asia-pacific or europe you can get lower latency, or if the us-east-1 zone is on fire you can work somewhere else.

This also includes changes to move some data onto tmpfs, in the hope that will make things faster. It's still running the first test but seems to be working ok, and not doing any hard io.

the devscripts/ec2 is a bit hacky. I don't know if this makes it too much worse.

This also makes it give better progress and error messages in several cases.

It fixes a bug where in the case of a problem, it tried to shut down the instance the wrong way and got back a 400 error from AWS, because we asked to stop instead of terminate.

Revision history for this message

Martin Pool (mbp) wrote on 2011-11-17:

I know there's a lot of things in here but the latency to test it is such it's hard to be sure separate branches work.

Revision history for this message

Michael Hudson-Doyle (mwhudson) wrote on 2011-11-17:

There was quite a lot here, but all the changes look good, thanks for working on this!

Obviously, please don't land until you've successfully tested it all -- and the tmpfs stuff does make things a bit more complicated, so we should verify that it is actually an improvement.

Have you run the tests that the ec2 code does have?

review: Approve

Revision history for this message

Martin Pool (mbp) wrote on 2011-11-17:

> There was quite a lot here, but all the changes look good, thanks for working
> on this!
>
> Obviously, please don't land until you've successfully tested it all -- and
> the tmpfs stuff does make things a bit more complicated, so we should verify
> that it is actually an improvement.

I'll wait for a test run to successfully complete there before I send it in. The bar is at about 3h40m after your change to use m2.xlarge, which this branch also makes the new default.

> Have you run the tests that the ec2 code does have?

Thanks for the reminder - I hadn't recently, but it only needed a tiny tweak.