fix(controller): add scheduler logs to app logs

fix(controller): roll back if scale fails

Author: smothiki

controller/api/models.py

@@ -292,6 +292,7 @@ def _start_containers(self, to_add):
         if any(c.state != 'created' for c in to_add):
             err = 'aborting, failed to create some containers'
             log_event(self, err, logging.ERROR)
+            self._destroy_containers(to_add)
             raise RuntimeError(err)
         [t.start() for t in start_threads]
         [t.join() for t in start_threads]

controller/api/tests/test_scheduler.py

@@ -75,10 +75,7 @@ def test_create_chaos(self):
         url = "/v1/apps/{app_id}/containers".format(**locals())
         response = self.client.get(url, HTTP_AUTHORIZATION='token {}'.format(self.token))
         self.assertEqual(response.status_code, 200)
-        self.assertEqual(len(response.data['results']), 20)
-        # make sure some failed
-        states = set([c['state'] for c in response.data['results']])
-        self.assertEqual(states, set(['error', 'created']))
+        self.assertEqual(len(response.data['results']), 0)
 
     def test_start_chaos(self):
         url = '/v1/apps'
@@ -304,7 +301,6 @@ def test_build_chaos(self):
         response = self.client.get(url, HTTP_AUTHORIZATION='token {}'.format(self.token))
         self.assertEqual(response.status_code, 200)
         self.assertEqual(len(response.data['results']), 20)
-
         # make sure all old containers are still up
         states = set([c['state'] for c in response.data['results']])
         self.assertEqual(states, set(['up']))

controller/scheduler/swarm.py

@@ -33,7 +33,8 @@ def create(self, name, image, command='', template=None, **kwargs):
                 mem = mem[:-1]
         cpu = kwargs.get('cpu', {}).get(l['c_type'])
         self.docker_cli.create_container(image=cimage, name=name,
-                                         command=command.encode('utf-8'), mem_limit=mem,
+                                         command=command.encode('utf-8'),
+                                         mem_limit=mem,
                                          cpu_shares=cpu,
                                          environment=[affinity],
                                          host_config={'PublishAllPorts': True})