Merge lp:~jason-hobbs/juju-deployer/juju-deployer-populate-first into lp:juju-deployer

[Jason Hobbs]

Update of lp:~raharper/juju-deployer/populate-first - this merges a newer trunk. It also rename's rharper's add_machine to 'add_specific_machine' to avoid a conflict with the 'add_machine' from trunk. That needs a closer looking at to see how to use just one of those methods but I don't have time to figure it out right now.

[lp:~jason-hobbs/juju-deployer/juju-deployer-populate-first]

152. By Jason Hobbs on 2015-06-09

Fix syntax error and unit test.

153. By Jason Hobbs on 2015-06-09

Pull in lutostag's test fixes.

154. By Jason Hobbs on 2015-06-10

Force service sorting, and log it.

155. By Jason Hobbs on 2015-06-11

Specify series when adding a specific machine.

156. By Jason Hobbs on 2015-06-24

Use charm series if one provided by the charm.

This fixes deploying mixed Ubuntu/Windows bundles.

157. By Jason Hobbs on 2015-07-06

Timeout when acquiring a node takes too long.

Unmerged revisions

157. By Jason Hobbs on 2015-07-06

Timeout when acquiring a node takes too long.

156. By Jason Hobbs on 2015-06-24

Use charm series if one provided by the charm.

This fixes deploying mixed Ubuntu/Windows bundles.

155. By Jason Hobbs on 2015-06-11

Specify series when adding a specific machine.

154. By Jason Hobbs on 2015-06-10

Force service sorting, and log it.

153. By Jason Hobbs on 2015-06-09

Pull in lutostag's test fixes.

152. By Jason Hobbs on 2015-06-09

Fix syntax error and unit test.

151. By Jason Hobbs on 2015-06-08

Merge trunk.

150. By Ryan Harper on 2015-03-04

Allow nested placement when target uses maas= placement. Fix up debugging log message during deploy_services.

149. By Ryan Harper on 2015-03-04

Modify depoyment.deploy_services to bring services with placement and multiple units online to ensure subsequent services which placement can target previously deployed service units. Update get_machine to handle container placement.

148. By Ryan Harper on 2015-03-03

Fix typo

=== modified file 'Makefile'
--- Makefile	2014-08-26 22:34:07 +0000
+++ Makefile	2015-07-06 20:11:20 +0000
@@ -1,5 +1,9 @@
+ifeq (,$(wildcard $(HOME)/.bazaar/bazaar.conf))
+    PREFIX=HOME=/tmp
+endif
 test:
-	nosetests -s --verbosity=2 deployer/tests
+	/bin/bash -c 'if [ -n "$(PREFIX)" ]; then mkdir -p /tmp/.juju; else true; fi'
+	/bin/bash -c "$(PREFIX) nosetests -s --verbosity=2 deployer/tests"
 
 freeze:
 	pip install -d tools/dist -r requirements.txt
 
=== modified file 'deployer/action/importer.py'
--- deployer/action/importer.py	2015-05-28 13:04:30 +0000
+++ deployer/action/importer.py	2015-07-06 20:11:20 +0000
@@ -1,5 +1,6 @@
 import logging
 import time
+import math
 
 from .base import BaseAction
 from ..env import watchers
@@ -58,7 +59,8 @@
                 "Adding %d more units to %s" % (abs(delta), svc.name))
             if svc.unit_placement:
                 # Reload status once after non placed services units are done.
-                if reloaded is False:
+
+                if self.options.placement_first is True or reloaded is False:
                     # Improved crappy workaround juju-core api inconsistency
                     delay = time.time() + 60
                     while delay > time.time():
@@ -71,7 +73,8 @@
 
                 placement = self.deployment.get_unit_placement(svc, env_status)
                 for mid in range(cur_units, svc.num_units):
-                    self.env.add_unit(svc.name, placement.get(mid))
+                    self.env.add_unit(svc.name,
+                                      self.get_machine(placement.get(mid)))
             else:
                 self.env.add_units(svc.name, abs(delta))
 
@@ -181,13 +184,17 @@
             charm = self.deployment.get_charm_for(svc.name)
             self.log.info(
                 " Deploying service %s using %s", svc.name, charm.charm_url)
+            
+            # Use charm series instead of deployment one if charm provides it.
+            # If charm does not provide series, this will be set to None.
+            charm_series = self.deployment.get_charm_series(svc.name) 
 
             if svc.unit_placement:
                 # We sorted all the non placed services first, so we only
                 # need to update status once after we're done with them, in
                 # the instance of v3 bundles; in the more complex case of v4
                 # bundles, we'll need to refresh each time.
-                if not reloaded:
+                if self.options.placement_first or not reloaded:
                     self.log.debug(
                         " Refetching status for placement deploys")
                     time.sleep(5.1)
@@ -210,18 +217,59 @@
                 num_units = None
 
             placement = self.deployment.get_unit_placement(svc, env_status)
-
-            if charm.is_subordinate():
-                num_units = None
-
-            self.env.deploy(
-                svc.name,
-                charm.charm_url,
-                self.deployment.repo_path,
-                svc.config,
-                svc.constraints,
-                num_units,
-                placement.get(0))
+            # allocate all of the machines up front for all units
+            # to ensure we don't allocate a targeted machine to
+            # a service without placement
+            if svc.unit_placement and \
+               svc.num_units > 1 and \
+               self.options.placement_first is True:
+                self.log.debug('Pre-allocating machines for %s' % svc.name)
+                self.log.debug('Deploy base service: %s' % svc.name)
+                p = placement.get(0)
+                machine = self.get_machine(p, charm_series)
+                self.log.debug('deploy_services: '
+                               'service=%s unit=0 placement=%s machine=%s' %
+                               (svc.name, p, machine))
+                num_units = 1
+                # deploy base service
+                self.env.deploy(
+                    svc.name,
+                    charm.charm_url,
+                    self.deployment.repo_path,
+                    svc.config,
+                    svc.constraints,
+                    num_units,
+                    machine)
+
+                # add additional units
+                time.sleep(5.1)
+                env_status = self.env.status()
+                cur_units = len(env_status['services'][svc.name].get('units', ()))
+                placement = self.deployment.get_unit_placement(svc, env_status)
+                for uid in range(cur_units, svc.num_units):
+                    p = placement.get(uid)
+                    machine = self.get_machine(p, charm_series)
+                    self.log.debug('add_units: '
+                                   'service=%s unit=%s placement=%s machine=%s' %
+                                   (svc.name, uid, p, machine))
+                    self.env.add_unit(svc.name, machine)
+
+
+            else:
+                # just let add_units handling bring additional units on-line
+                num_units = 1
+
+                if charm.is_subordinate():
+                    num_units = None
+
+                self.env.deploy(
+                    svc.name,
+                    charm.charm_url,
+                    self.deployment.repo_path,
+                    svc.config,
+                    svc.constraints,
+                    num_units,
+                    self.get_machine(placement.get(0), charm_series))
 
             if svc.annotations:
                 self.log.debug(" Setting annotations")
@@ -294,6 +342,80 @@
             int(timeout), watch=self.options.watch,
             services=self.deployment.get_service_names(), on_errors=on_errors)
 
+    def get_machine(self, u_idx, charm_series=None):
+        # find the machine id that matches the target machine
+        # unlike juju status output, the dns-name is one of the
+        # many values returned from our env.status() in addresses
+        if u_idx is None:
+            return None
+
+        status = self.env.status()
+        # lxc:1 kvm:1, or 1
+        if ':' in u_idx or u_idx.isdigit():
+            mid = [u_idx]
+        else:
+            mid = [x for x in status['machines'].keys()
+               if u_idx in
+               [v.get('Value') for v in
+                status['machines'][x]['addresses']]]
+        self.deployment.log.info('mid=%s' % mid)
+        if mid:
+            m = mid.pop()
+            self.deployment.log.debug(
+                'Found juju machine (%s) matching placement: %s', m, u_idx)
+            return m
+        else:
+            self.deployment.log.info(
+                'No match in juju machines for: %s', u_idx)
+
+            # if we don't find a match, we need to add it
+            series = self.deployment.data['series']
+            if (charm_series is not None) and (charm_series != series):
+                # override series if different from deployment series 
+                series = charm_series
+
+            mid = self.env.add_specific_machine(u_idx, series)
+
+            # timeout set to ~17 minutes which is much larger than needed
+            backoff = 2
+            delay = 1
+            timeout = math.pow(2, 10) 
+
+            self.deployment.log.debug(
+                'Waiting for machine to show up in status.')
+            while True:
+                m = mid.get('Machine')
+                if m in status['machines'].keys():
+                    s = [x for x in status['machines'].keys()
+                         if u_idx in
+                         [v.get('Value') for v in
+                          status['machines'][x]['addresses']]]
+                    self.deployment.log.debug('addresses: %s' % s)
+                    if m in s:
+                        break
+                else:
+                    self.deployment.log.debug(
+                        'Machine %s not in status yet' % m)
+
+                self.deployment.log.debug("Sleep for %s second(s).",
+                                          str(delay))
+                time.sleep(delay)
+                delay *= backoff
+
+                # The case of a machine failing to show up is really a 
+                # an unrecoverable failure that can't be dealt with as upstream
+                # is not handling this case. So, the deployment must fail here. 
+                if timeout-delay <= 0:
+                    self.deployment.log.error(
+                         "Deployment has failed. Machine %s did not show up.",
+                          u_idx)
+                    raise ErrorExit()
+
+
+                status = self.env.status()
+            self.deployment.log.debug('Machine %s up!' % m)
+            return mid.get('Machine')
+
     def run(self):
         options = self.options
         self.start_time = time.time()
 
=== modified file 'deployer/cli.py'
--- deployer/cli.py	2014-10-01 10:18:36 +0000
+++ deployer/cli.py	2015-07-06 20:11:20 +0000
@@ -82,6 +82,13 @@
               "machine removal."),
         dest="deploy_delay", default=0)
     parser.add_argument(
+        '-P', '--placement-first', action='store_true', default=False,
+        dest='placement_first',
+        help=("Sort services with placement services first to "
+              "ensure that the requirement machines are aquired "
+              "before non-targeted services are deployed.  Note "
+              "this reverses the default sorting order."))
+    parser.add_argument(
         '-e', '--environment', action='store', dest='juju_env',
         help='Deploy to a specific Juju environment.',
         default=os.getenv('JUJU_ENV'))
 
=== modified file 'deployer/deployment.py'
--- deployer/deployment.py	2015-05-13 14:16:46 +0000
+++ deployer/deployment.py	2015-07-06 20:11:20 +0000
@@ -46,11 +46,10 @@
         services = []
         for name, svc_data in self.data.get('services', {}).items():
             services.append(Service(name, svc_data))
-        if self.version == 3:
-            # Sort unplaced units first, then sort by name for placed units.
-            services.sort(key=lambda svc: (bool(svc.unit_placement), svc.name))
-        else:
-            services.sort(self._machines_placement_sort)
+
+        self.log.debug("Sorting services: %s" % services)
+        services.sort(self._services_sort)
+        self.log.debug("Sorted services: %s" % services)
         return services
 
     def set_machines(self, machines):
@@ -81,7 +80,7 @@
         return self.data.get('services', {}).keys()
 
     @staticmethod
-    def _machines_placement_sort(svc_a, svc_b):
+    def _services_sort(svc_a, svc_b):
         """Sort machines with machine placement in mind.
 
         If svc_a is colocated alongside svc_b, svc_b needs to be deployed
@@ -90,6 +89,35 @@
         whether or not the service has a unit placement, and then finally
         based on the name of the service.
         """
+        def _placement_sort(svc_a, svc_b):
+            """ Sorts unit_placement lists,
+                putting maas= units at the front"""
+            def maas_first(a, b):
+                if a.startswith('maas='):
+                    if b.startswith('maas='):
+                        return cmp(a, b)
+                    return -1
+                if b.startswith('maas='):
+                        return 1
+
+                if ':' in a:
+                    if ':' in b:
+                        return cmp(a, b)
+                    return 1
+                
+                return cmp(a, b)
+
+            # sort both services' unit_placement lists
+            # putting maas units first
+            svc_a.unit_placement.sort(cmp=maas_first)
+            svc_b.unit_placement.sort(cmp=maas_first)
+
+            # now compare the service placement lists,
+            # first list with a maas placement goes first
+            for x, y in zip(svc_a.unit_placement,
+                            svc_b.unit_placement):
+                return maas_first(x, y)
+
         if svc_a.unit_placement:
             if svc_b.unit_placement:
                 # Check for colocation.  This naively assumes that there is no
@@ -98,8 +126,8 @@
                     return -1
                 if x_in_y(svc_a, svc_b):
                     return 1
-                # If no colocation exists, simply compare names.
-                return cmp(svc_a.name, svc_b.name)
+                # If no colocation exists, do a placement sort.
+                return _placement_sort(svc_a, svc_b)
             return 1
         if svc_b.unit_placement:
             return -1
@@ -166,6 +194,10 @@
         return Charm.from_service(
             svc_name, self.repo_path, self.series, svc_data)
 
+    def get_charm_series(self, svc_name):
+        svc_data = self.data['services'][svc_name]
+        return svc_data.get('series')
+
     def fetch_charms(self, update=False, no_local_mods=False):
         for charm in self.get_charms():
             if charm.is_local():
 
=== modified file 'deployer/env/go.py'
--- deployer/env/go.py	2015-03-12 18:41:43 +0000
+++ deployer/env/go.py	2015-07-06 20:11:20 +0000
@@ -41,6 +41,30 @@
             series=series, 
             constraints=parse_constraints(constraints))['Machine']
 
+    def add_specific_machine(self, machine, series=""):
+        if ':' in machine:
+            scope, directive = machine.split(':')
+        else:
+            scope = self.get_env_config()['Config']['uuid']
+            directive = machine
+        
+        machines = [{
+            "Placement": {
+                "Scope": scope,
+                "Directive": directive,
+            },
+            "ParentId": "",
+            "ContainerType": "",
+            "Series": series,
+            "Constraints": {},
+            "Jobs": [
+                "JobHostUnits"
+            ]
+        }]
+        self.log.debug('Adding machine: %s:%s' % (scope, directive))
+        # {u'Machines': [{u'Machine': u'7', u'Error': None}]}
+        return self.client.add_machines(machines)['Machines'][0]
+
     def add_unit(self, service_name, machine_spec):
         return self.client.add_unit(service_name, machine_spec)
 
@@ -68,6 +92,9 @@
     def get_config(self, svc_name):
         return self.client.get_config(svc_name)
 
+    def get_env_config(self):
+        return self.client.get_env_config()
+
     def get_constraints(self, svc_name):
         try:
             return self.client.get_constraints(svc_name)
 
=== modified file 'deployer/env/py.py'
--- deployer/env/py.py	2014-02-18 12:16:46 +0000
+++ deployer/env/py.py	2015-07-06 20:11:20 +0000
@@ -12,6 +12,12 @@
         self.name = name
         self.options = options
 
+    def add_machine(self, machine):
+        params - self._named_env(["juju", "add-machine"])
+        params.extend([machine])
+        self._check_call(
+            params, self.log, "Error adding machine %s", machine)
+
     def add_units(self, service_name, num_units):
         params = self._named_env(["juju", "add-unit"])
         if num_units > 1:
 
=== modified file 'deployer/service.py'
--- deployer/service.py	2015-03-18 18:19:43 +0000
+++ deployer/service.py	2015-07-06 20:11:20 +0000
@@ -152,12 +152,19 @@
                     feedback.error(
                         ("Service placement to machine"
                          "not supported %s to %s") % (
-                             self.service.name, unit_placement[idx]))
+                            self.service.name, unit_placement[idx]))
             elif p in services:
                 if services[p].unit_placement:
-                    feedback.error(
-                        "Nested placement not supported %s -> %s -> %s" % (
-                            self.service.name, p, services[p].unit_placement))
+                    # nested placement is acceptable if the target
+                    # is using maas node placement
+                    for u in services[p].unit_placement:
+                        if not u.startswith('maas='):
+                            feedback.error(
+                                "Nested placement not supported"
+                                " %s -> %s -> %s" % (
+                                self.service.name, p,
+                                services[p].unit_placement))
+                    continue
                 elif self.deployment.get_charm_for(p).is_subordinate():
                     feedback.error(
                         "Cannot place to a subordinate service: %s -> %s" % (
 
=== modified file 'deployer/tests/test_charm.py'
--- deployer/tests/test_charm.py	2014-09-29 14:36:34 +0000
+++ deployer/tests/test_charm.py	2015-07-06 20:11:20 +0000
@@ -161,6 +161,14 @@
         self._call(
             ["git", "init", self.path],
             "Could not initialize repo at  %(path)s")
+        self._call(
+            ["git", "config",
+              "user.email", "[e-mail]"],
+            "Could not config user.email at %(path)s")
+        self._call(
+            ["git", "config",
+              "user.name", "test"],
+            "Could not config user.name at %(path)s")
 
     def write(self, files):
         for f in files:
 
=== modified file 'deployer/tests/test_deployment.py'
--- deployer/tests/test_deployment.py	2015-03-18 18:19:43 +0000
+++ deployer/tests/test_deployment.py	2015-07-06 20:11:20 +0000
@@ -75,8 +75,6 @@
     def test_maas_name_and_zone_placement(self):
         d = self.get_named_deployment_v3("stack-placement-maas.yml", "stack")
         d.validate_placement()
-        placement = d.get_unit_placement('ceph', {})
-        self.assertEqual(placement.get(0), "arnolt")
         placement = d.get_unit_placement('heat', {})
         self.assertEqual(placement.get(0), "zone=zebra")
 
@@ -90,35 +88,35 @@
         except ErrorExit:
             self.fail("Should not fail")
 
-    def test_machines_placement_sort(self):
+    def test_services_sort(self):
         d = Deployment('test', None, None)
         self.assertEqual(
-            d._machines_placement_sort(
+            d._services_sort(
                 FauxService(unit_placement=1),
                 FauxService()
             ), 1)
         self.assertEqual(
-            d._machines_placement_sort(
+            d._services_sort(
                 FauxService(),
                 FauxService(unit_placement=1)
             ), -1)
         self.assertEqual(
-            d._machines_placement_sort(
+            d._services_sort(
                 FauxService(name="x", unit_placement=['asdf']),
                 FauxService(name="y", unit_placement=['lxc:x/1'])
             ), 1)
         self.assertEqual(
-            d._machines_placement_sort(
+            d._services_sort(
                 FauxService(name="y", unit_placement=['lxc:x/1']),
                 FauxService(name="x", unit_placement=['asdf'])
             ), -1)
         self.assertEqual(
-            d._machines_placement_sort(
+            d._services_sort(
                 FauxService(name="x", unit_placement=['asdf']),
                 FauxService(name="y", unit_placement=['hjkl'])
             ), -1)
         self.assertEqual(
-            d._machines_placement_sort(
+            d._services_sort(
                 FauxService(name="x"),
                 FauxService(name="y")
             ), -1)
 
=== modified file 'deployer/tests/test_diff.py'
--- deployer/tests/test_diff.py	2015-03-17 17:34:57 +0000
+++ deployer/tests/test_diff.py	2015-07-06 20:11:20 +0000
@@ -35,8 +35,9 @@
         cls._dir = tempfile.mkdtemp()
         os.mkdir(os.path.join(cls._dir, "precise"))
         deployment.repo_path = cls._dir
-        deployment.fetch_charms()
-        deployment.resolve()
+        if not TEST_OFFLINE:
+            deployment.fetch_charms()
+            deployment.resolve()
         cls._deployment = deployment
 
     @classmethod
 
=== modified file 'deployer/tests/test_guiserver.py'
--- deployer/tests/test_guiserver.py	2015-03-17 10:40:34 +0000
+++ deployer/tests/test_guiserver.py	2015-07-06 20:11:20 +0000
@@ -28,7 +28,7 @@
             'find_service', 'ignore_errors', 'juju_env', 'list_deploys',
             'no_local_mods', 'no_relations', 'overrides', 'rel_wait',
             'retry_count', 'series', 'skip_unit_wait', 'terminate_machines',
-            'timeout', 'update_charms', 'verbose', 'watch'
+            'timeout', 'update_charms', 'verbose', 'watch', 'placement_first',
         ])
         self.assertEqual(expected_keys, set(self.options.__dict__.keys()))
 
@@ -58,6 +58,7 @@
         self.assertFalse(options.update_charms)
         self.assertFalse(options.verbose)
         self.assertFalse(options.watch)
+        self.assertFalse(options.placement_first)
 
 
 class TestDeploymentError(unittest.TestCase):
@@ -280,7 +281,7 @@
             mock.call.status(),
             mock.call.deploy(
                 'mysql', 'cs:precise/mysql-28', '', None,
-                {'arch': 'i386', 'cpu-cores': 4, 'mem': '4G'}, 2, None),
+                {'arch': 'i386', 'cpu-cores': 4, 'mem': '4G'}, 1, None),
             mock.call.set_annotation(
                 'mysql', {'gui-y': '164.547', 'gui-x': '494.347'}),
             mock.call.deploy(
 
=== modified file 'deployer/tests/test_importer.py'
--- deployer/tests/test_importer.py	2015-05-13 14:06:34 +0000
+++ deployer/tests/test_importer.py	2015-07-06 20:11:20 +0000
@@ -34,6 +34,7 @@
             'no_local_mods': True,
             'no_relations': False,
             'overrides': None,
+            'placement_first': False,
             'rel_wait': 60,
             'retry_count': 0,
             'series': None,