Merge pull request #906 from helgi/deployment_boot

fix(boot): show a warning instead of error if a Deployment is in progress when Deis Workflow is starting up

Author: helgi

rootfs/api/management/commands/load_db_state_to_k8s.py

@@ -2,7 +2,7 @@
 from django.shortcuts import get_object_or_404
 
 from api.models import Key, App, Domain, Certificate, Config
-from api.exceptions import DeisException
+from api.exceptions import DeisException, AlreadyExists
 
 
 class Command(BaseCommand):
@@ -37,6 +37,10 @@ def handle(self, *args, **options):
 
             try:
                 application.deploy(rel)
+            except AlreadyExists as error:
+                print('WARNING: {} has a deployment in progress. '
+                      'Skipping deployment...'.format(application))
+                continue
             except DeisException as error:
                 print('ERROR: There was a problem deploying {} '
                       'due to {}'.format(application, str(error)))

rootfs/api/models/app.py

@@ -521,12 +521,12 @@ def deploy(self, release, force_deploy=False):
         deploys = OrderedDict(sorted(deploys.items(), key=lambda d: d[1].get('routable')))
 
         for scale_type, kwargs in deploys.items():
-            try:
-                # Is there an existing deployment in progress?
-                name = self._get_job_id(scale_type)
-                if not force_deploy and release.deployment_in_progress(self.id, name):
-                    raise AlreadyExists('Deployment for {} is already in progress'.format(name))
+            # Is there an existing deployment in progress?
+            name = self._get_job_id(scale_type)
+            if not force_deploy and release.deployment_in_progress(self.id, name):
+                raise AlreadyExists('Deployment for {} is already in progress'.format(name))
 
+            try:
                 self._scheduler.deploy(
                     namespace=self.id,
                     name=self._get_job_id(scale_type),