refactor(deis-run): new deis run implementation and celery task

Author: Gabriel Monroy

client/deis.py

@@ -621,7 +621,7 @@ def apps_run(self, args):
                                   "/api/apps/{}/run".format(app),
                                   json.dumps(body))
         if response.status_code == requests.codes.ok:  # @UndefinedVariable
-            output, rc = json.loads(response.content)
+            rc, output = json.loads(response.content)
             if rc != 0:
                 print('Warning: non-zero return code {}'.format(rc))
             sys.stdout.write(output)

controller/api/models.py

@@ -178,19 +178,15 @@ def logs(self):
     def run(self, command):
         """Run a one-off command in an ephemeral app container."""
         # TODO: add support for interactive shell
-        release = self.release_set.latest()
-        if not release.build:
-            raise EnvironmentError('No build exists, please run `git push deis master` first')
-        # prepare ssh command
-        version = release.version
-        image = release.image
-        docker_args = ' '.join(['-a', 'stdout', '-a', 'stderr', '-rm', image])
-        env_args = ' '.join(["-e '{k}={v}'".format(**locals())
-                             for k, v in release.config.values.items()])
         log_event(self, "deis run '{}'".format(command))
-        command = "sudo docker run {env_args} {docker_args} {command}".format(**locals())
-        # TODO: wire up to job dispath
-        return 0, 'Not implemented yet'
+        c_num = max([c.num for c in self.container_set.filter(type='admin')] or [0]) + 1
+        c = Container.objects.create(owner=self.owner,
+                                     app=self,
+                                     release=self.release_set.latest(),
+                                     type='admin',
+                                     num=c_num)
+        rc, output = tasks.run_command.delay(c, command).get()
+        return rc, output
 
 
 @python_2_unicode_compatible
@@ -295,6 +291,14 @@ def destroy(self):
         self.state = 'destroyed'
         self.save()
 
+    def run(self, command):
+        self.state = 'running'
+        self.save()
+        rc, output = self._scheduler.run(self._job_id, self.release.image, command)
+        self.state = 'completed'
+        self.save()
+        return rc, output
+
 
 @python_2_unicode_compatible
 class Push(UuidAuditedModel):

controller/api/tasks.py

@@ -76,3 +76,23 @@ def stop_containers(containers):
             c.state = 'error'
             c.save()
             raise
+
+
+@task
+def run_command(c, command):
+    release = c.release
+    version = release.version
+    image = release.image
+    try:
+        # pull the image first
+        rc, pull_output = c.run("docker pull {image}".format(**locals()))
+        if rc != 0:
+            raise EnvironmentError('Could not pull image: {pull_image}'.format(**locals()))
+        # run the command
+        docker_args = ' '.join(['-a', 'stdout', '-a', 'stderr', '--rm', image])
+        env_args = ' '.join(["-e '{k}={v}'".format(**locals())
+                             for k, v in release.config.values.items()])
+        command = "docker run {env_args} {docker_args} {command}".format(**locals())
+        return c.run(command)
+    finally:
+        c.delete()

controller/scheduler/coreos.py

@@ -199,6 +199,17 @@ def run(self, name, image, command):
         rc = p.wait()
         return rc, p.stdout.read()
 
+    def run(self, name, image, command):
+        """
+        Run a one-off command
+        """
+        print 'Running {name}'.format(**locals())
+        output = subprocess.PIPE
+        p = subprocess.Popen('fleetrun.sh {command}'.format(**locals()), shell=True, env=self.env,
+                             stdout=output, stderr=subprocess.STDOUT)
+        rc = p.wait()
+        return rc, p.stdout.read()
+
     def attach(self, name):
         """
         Attach to a job's stdin, stdout and stderr

controller/scheduler/fleetctl.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 set -e
 
-SSH_OPTIONS="-i $FLEETW_KEY -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null"
+SSH_OPTIONS="-i $FLEETW_KEY -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o LogLevel=ERROR"
 
 # set debug if provided as an envvar
 [[ $DEBUG ]] && set -x

controller/scheduler/fleetrun.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+set -e
+
+SSH_OPTIONS="-i $FLEETW_KEY -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o LogLevel=ERROR"
+
+# set debug if provided as an envvar
+[[ $DEBUG ]] && set -x
+
+# run the fleetctl command remotely
+ssh $SSH_OPTIONS core@$FLEETW_HOST $@

controller/scheduler/mock.py

@@ -50,6 +50,12 @@ def destroy(self, name):
         """
         return {'state': 'inactive'}
 
+    def run(self, name, image, command):
+        """
+        Run a one-off command
+        """
+        return 0, ''
+
     def attach(self, name):
         """
         Attach to a job's stdin, stdout and stderr