Merge lp:~wgrant/juju-deployer/slaughter-suboordinate-slumber into lp:juju-deployer
Proposed by
William Grant
Status: | Merged |
---|---|
Merged at revision: | 201 |
Proposed branch: | lp:~wgrant/juju-deployer/slaughter-suboordinate-slumber |
Merge into: | lp:juju-deployer |
Diff against target: |
189 lines (+17/-69) 4 files modified
deployer/action/importer.py (+7/-21) deployer/tests/base.py (+1/-36) deployer/tests/test_guiserver.py (+3/-7) deployer/tests/test_importer.py (+6/-5) |
To merge this branch: | bzr merge lp:~wgrant/juju-deployer/slaughter-suboordinate-slumber |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Tim Van Steenburgh (community) | Approve | ||
Review via email:
|
Commit message
Refactor subordinate 60-second sleep away.
Description of the change
Refactor subordinate 60-second sleep away.
r146 caused add_units to wait 60 seconds for every subordinate service.
This was to avoid a crash when it attempted to retrieve the number of
units of the service before Juju had had a chance to include the service
in status output yet. But add_units just skips any subordinate service
anyway, so a much less slow fix is to just move the subordinate check to
the top of the loop.
I also cleaned up some tests which patched the mock environment to skip
the formerly dreadfully slow bits of add_units.
To post a comment you must log in.
This is great, thanks William. I left one inline comment for your review.