Merge pull request #589 from helgi/fix_run

fix(scheduler): deis run could never reach the failed state

Author: helgi

rootfs/scheduler/__init__.py

@@ -542,9 +542,16 @@ def run(self, namespace, name, image, entrypoint, command, **kwargs):
                     self._delete_pod(namespace, name)
                     return 0, log
 
-                if pod['status']['phase'] == 'Running':
+                elif pod['status']['phase'] == 'Running':
                     if iteration > 28:
                         duration += 1
+
+                elif pod['status']['phase'] == 'Failed':
+                    pod_state = pod['status']['containerStatuses'][0]['state']
+                    err_code = pod_state['terminated']['exitCode']
+                    self._delete_pod(namespace, name)
+                    return err_code, data
+
             except KubeException:
                 break
 
@@ -555,12 +562,6 @@ def run(self, namespace, name, image, entrypoint, command, **kwargs):
             error(response, 'Pod start took more than 30 seconds', namespace)
             return 0, data
 
-        if pod['status']['phase'] == 'Failed':
-            pod_state = pod['status']['containerStatuses'][0]['state']
-            err_code = pod_state['terminated']['exitCode']
-            self._delete_pod(namespace, name)
-            return err_code, data
-
         return 0, data
 
     def _set_environment(self, data, **kwargs):