lp:~wgrant/juju-deployer/slaughter-suboordinate-slumber
- Get this branch:
- bzr branch lp:~wgrant/juju-deployer/slaughter-suboordinate-slumber
Branch merges
- Tim Van Steenburgh (community): Approve
-
Diff: 189 lines (+17/-69)4 files modifieddeployer/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)
Related source package recipes
Branch information
Recent revisions
- 200. By William Grant
-
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. - 194. By Tim Van Steenburgh
-
[james-page] Deal with either Machine or machine when determining placement
This ensures compatibility with juju 1 and 2.
- 193. By Tim Van Steenburgh
-
[james-page] Ensure machines are added in numerical order
Avoids a race where its possible for machine '1' to be created first, and
then machine '0' appears in machines, so it never actually gets added to
the environment and subsequent placement is completely foobar.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:juju-deployer
