fix(version):Use a different version number for each release

Author: kmala

rootfs/api/management/commands/load_db_state_to_k8s.py

@@ -24,7 +24,7 @@ def handle(self, *args, **options):
         # deploy applications
         print("Deploying available applications")
         for application in App.objects.all():
-            rel = application.release_set.latest()
+            rel = application.release_set.filter(failed=False).latest()
             if rel.build is None:
                 print('WARNING: {} has no build associated with '
                       'its latest release. Skipping deployment...'.format(application))

rootfs/api/migrations/0020_release_failed.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.1 on 2016-10-03 18:50
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api', '0019_auto_20160930_2351'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='release',
+            name='failed',
+            field=models.BooleanField(default=False),
+        ),
+    ]

rootfs/api/models/app.py

@@ -138,7 +138,7 @@ def _get_command(self, container_type):
         """
         try:
             # FIXME: remove slugrunner's hardcoded entrypoint
-            release = self.release_set.latest()
+            release = self.release_set.filter(failed=False).latest()
             if release.build.dockerfile or not release.build.sha:
                 return [release.build.procfile[container_type]]
 
@@ -161,7 +161,7 @@ def _get_entrypoint(self, container_type):
 
         # if this is a procfile-based app, switch the entrypoint to slugrunner's default
         # FIXME: remove slugrunner's hardcoded entrypoint
-        release = self.release_set.latest()
+        release = self.release_set.filter(failed=False).latest()
         if release.build.procfile and \
            release.build.sha and not \
            release.build.dockerfile:
@@ -352,10 +352,10 @@ def scale(self, user, structure):  # noqa
         # use create to make sure minimum resources are created
         self.create()
 
-        if self.release_set.latest().build is None:
+        if self.release_set.filter(failed=False).latest().build is None:
             raise DeisException('No build associated with this release')
 
-        release = self.release_set.latest()
+        release = self.release_set.filter(failed=False).latest()
 
         # Validate structure
         try:
@@ -401,7 +401,7 @@ def scale(self, user, structure):  # noqa
         return False
 
     def _scale_pods(self, scale_types):
-        release = self.release_set.latest()
+        release = self.release_set.filter(failed=False).latest()
         app_settings = self.appsettings_set.latest()
 
         # use slugrunner image for app if buildpack app otherwise use normal image
@@ -577,7 +577,7 @@ def verify_application_health(self, **kwargs):
         only run after kubernetes has reported all pods as healthy
         """
         # Bail out early if the application is not routable
-        release = self.release_set.latest()
+        release = self.release_set.filter(failed=False).latest()
         app_settings = self.appsettings_set.latest()
         if not kwargs.get('routable', False) and app_settings.routable:
             return
@@ -681,7 +681,7 @@ def pod_name(size=5, chars=string.ascii_lowercase + string.digits):
             return ''.join(random.choice(chars) for _ in range(size))
 
         """Run a one-off command in an ephemeral app container."""
-        release = self.release_set.latest()
+        release = self.release_set.filter(failed=False).latest()
         if release.build is None:
             raise DeisException('No build associated with this release to run this command')
 
@@ -769,7 +769,7 @@ def _scheduler_filter(self, **kwargs):
 
         # always supply a version, either latest or a specific one
         if 'release' not in kwargs or kwargs['release'] is None:
-            release = self.release_set.latest()
+            release = self.release_set.filter(failed=False).latest()
         else:
             release = self.release_set.get(version=kwargs['release'])
 

rootfs/api/models/build.py

@@ -52,8 +52,8 @@ def version(self):
         return 'git-{}'.format(self.sha) if self.source_based else 'latest'
 
     def create(self, user, *args, **kwargs):
-        latest_release = self.app.release_set.latest()
-
+        latest_release = self.app.release_set.filter(failed=False).latest()
+        latest_version = self.app.release_set.latest().version
         try:
             new_release = latest_release.new(
                 user,
@@ -64,24 +64,29 @@ def create(self, user, *args, **kwargs):
             self.app.deploy(new_release)
             return new_release
         except Exception as e:
+            # check if the exception is during create or publish
+            if ('new_release' not in locals() and
+                    self.app.release_set.latest().version == latest_version+1):
+                new_release = self.app.release_set.latest()
             if 'new_release' in locals():
-                new_release.delete()
-            self.delete()
+                new_release.failed = True
+                new_release.summary = "{} deployed {} which failed".format(self.owner, str(self.uuid)[:7])  # noqa
+                new_release.save()
+            else:
+                self.delete()
 
             raise DeisException(str(e)) from e
 
     def save(self, **kwargs):
-        try:
-            removed = {}
-            previous_build = self.app.build_set.latest()
-            for proc in previous_build.procfile:
+        removed = {}
+        previous_release = self.app.release_set.filter(failed=False).latest()
+        if previous_release.build is not None:
+            for proc in previous_release.build.procfile:
                 if proc not in self.procfile:
                     # Scale proc type down to 0
                     removed[proc] = 0
 
             self.app.scale(self.owner, removed)
-        except Build.DoesNotExist:
-            pass
 
         return super(Build, self).save(**kwargs)
 

rootfs/api/models/config.py

@@ -148,7 +148,7 @@ def save(self, **kwargs):
         try:
             # Get config from the latest available release
             try:
-                previous_config = self.app.release_set.latest().config
+                previous_config = self.app.release_set.filter(failed=False).latest().config
             except Release.DoesNotExist:
                 # If that doesn't exist then fallback on app config
                 # usually means a totally new app

rootfs/api/models/release.py

@@ -23,6 +23,7 @@ class Release(UuidAuditedModel):
     app = models.ForeignKey('App', on_delete=models.CASCADE)
     version = models.PositiveIntegerField()
     summary = models.TextField(blank=True, null=True)
+    failed = models.BooleanField(default=False)
 
     config = models.ForeignKey('Config', on_delete=models.CASCADE)
     build = models.ForeignKey('Build', null=True, on_delete=models.CASCADE)
@@ -77,7 +78,7 @@ def new(self, user, config, build, summary=None, source_version='latest'):
         Releases start at v1 and auto-increment.
         """
         # construct fully-qualified target image
-        new_version = self.version + 1
+        new_version = self.app.release_set.latest().version + 1
         # create new release and auto-increment version
         release = Release.objects.create(
             owner=user, app=self.app, config=config,
@@ -202,7 +203,7 @@ def previous(self):
 
         try:
             # Get the Release previous to this one
-            prev_release = releases.latest()
+            prev_release = releases.filter(failed=False).latest()
         except Release.DoesNotExist:
             prev_release = None
         return prev_release
@@ -218,6 +219,9 @@ def rollback(self, user, version=None):
                 raise DeisException('Cannot roll back to initial release.')
 
             prev = self.app.release_set.get(version=version)
+            if prev.failed:
+                raise DeisException('Cannot roll back to failed release.')
+            latest_version = self.app.release_set.latest().version
             new_release = self.new(
                 user,
                 build=prev.build,
@@ -230,8 +234,14 @@ def rollback(self, user, version=None):
                 self.app.deploy(new_release, force_deploy=True)
             return new_release
         except Exception as e:
+            # check if the exception is during create or publish
+            if ('new_release' not in locals() and 'latest_version' in locals() and
+                    self.app.release_set.latest().version == latest_version+1):
+                new_release = self.app.release_set.latest()
             if 'new_release' in locals():
-                new_release.delete()
+                new_release.failed = True
+                new_release.summary = "{} performed roll back to a release that failed".format(self.owner)  # noqa
+                new_release.save()
             raise DeisException(str(e)) from e
 
     def cleanup_old(self):  # noqa

rootfs/api/tests/test_build.py

@@ -11,7 +11,7 @@
 from unittest import mock
 from rest_framework.authtoken.models import Token
 
-from api.models import Build
+from api.models import Build, App
 from registry.dockerclient import RegistryException
 from scheduler import KubeException
 
@@ -401,7 +401,7 @@ def test_build_image_in_registry_with_auth_no_port(self, mock_requests):
 
     def test_release_create_failure(self, mock_requests):
         """
-        Cause an Exception in app.deploy to cause a release.delete in build.create
+        Cause an Exception in app.deploy to cause a failed release in build.create
         """
         app_id = self.create_app()
 
@@ -422,7 +422,7 @@ def test_release_create_failure(self, mock_requests):
 
     def test_release_registry_create_failure(self, mock_requests):
         """
-        Cause a RegistryException in app.deploy to cause a release.delete in build.create
+        Cause a RegistryException in app.deploy to cause a failed release in build.create
         """
         app_id = self.create_app()
 
@@ -454,3 +454,36 @@ def test_build_deploy_kube_failure(self, mock_requests):
             body = {'image': 'autotest/example'}
             response = self.client.post(url, body)
             self.assertEqual(response.status_code, 400, response.data)
+
+    def test_build_failures(self, mock_requests):
+        app_id = self.create_app()
+        app = App.objects.get(id=app_id)
+
+        # deploy app to get a build
+        url = "/v2/apps/{app_id}/builds".format(**locals())
+        body = {'image': 'autotest/example'}
+        response = self.client.post(url, body)
+        self.assertEqual(response.status_code, 201, response.data)
+        self.assertEqual(response.data['image'], body['image'])
+        success_build = app.release_set.latest().build
+
+        # create a failed build to check that failed release is created
+        with mock.patch('api.models.App.deploy') as mock_deploy:
+            mock_deploy.side_effect = Exception('Boom!')
+
+            url = "/v2/apps/{app_id}/builds".format(**locals())
+            body = {'image': 'autotest/example'}
+            response = self.client.post(url, body)
+            self.assertEqual(response.status_code, 400, response.data)
+            self.assertEqual(app.release_set.latest().version, 3)
+            self.assertEqual(app.release_set.filter(failed=False).latest().version, 2)
+
+        # create a config to see that the new release is created with the last successful build
+        url = "/v2/apps/{app_id}/config".format(**locals())
+
+        body = {'values': json.dumps({'Test': 'test'})}
+        response = self.client.post(url, body)
+        self.assertEqual(response.status_code, 201, response.data)
+        self.assertEqual(app.release_set.latest().version, 4)
+        self.assertEqual(app.release_set.latest().build, success_build)
+        self.assertEqual(app.build_set.count(), 2)

rootfs/api/tests/test_config.py

@@ -331,3 +331,41 @@ def test_config_app_not_exists(self, mock_requests):
         response = self.client.get(url)
         self.assertEqual(response.status_code, 404)
         self.assertEqual(response.data, 'No App matches the given query.')
+
+    def test_config_failures(self, mock_requests):
+        app_id = self.create_app()
+        app = App.objects.get(id=app_id)
+
+        # deploy app to get a build
+        url = "/v2/apps/{}/builds".format(app_id)
+        body = {'image': 'autotest/example'}
+        response = self.client.post(url, body)
+        self.assertEqual(response.status_code, 201, response.data)
+        self.assertEqual(response.data['image'], body['image'])
+
+        # set an initial config value
+        url = "/v2/apps/{app_id}/config".format(**locals())
+        body = {'values': json.dumps({'NEW_URL1': 'http://localhost:8080/'})}
+        response = self.client.post(url, body)
+        self.assertEqual(response.status_code, 201, response.data)
+        self.assertIn('NEW_URL1', response.data['values'])
+        success_config = app.release_set.latest().config
+
+        # create a failed config to check that failed release is created
+        with mock.patch('api.models.App.deploy') as mock_deploy:
+            mock_deploy.side_effect = Exception('Boom!')
+            url = '/v2/apps/{app_id}/config'.format(**locals())
+            body = {'values': json.dumps({'test': "testvalue"})}
+            response = self.client.post(url, body)
+            self.assertEqual(response.status_code, 400)
+            self.assertEqual(app.release_set.latest().version, 4)
+            self.assertEqual(app.release_set.filter(failed=False).latest().version, 3)
+
+        # create a build to see that the new release is created with the last successful config
+        url = "/v2/apps/{}/builds".format(app_id)
+        body = {'image': 'autotest/example'}
+        response = self.client.post(url, body)
+        self.assertEqual(response.status_code, 201, response.data)
+        self.assertEqual(app.release_set.latest().version, 5)
+        self.assertEqual(app.release_set.latest().config, success_config)
+        self.assertEqual(app.config_set.count(), 3)

rootfs/api/tests/test_release.py

@@ -117,7 +117,7 @@ def test_response_data(self, mock_requests):
         response = self.client.get(url)
         for key in response.data.keys():
             self.assertIn(key, ['uuid', 'owner', 'created', 'updated', 'app', 'build', 'config',
-                                'summary', 'version'])
+                                'summary', 'version', 'failed'])
         expected = {
             'owner': self.user.username,
             'app': app_id,
@@ -263,6 +263,7 @@ def test_release_rollback_failure(self, mock_requests):
         Cause an Exception in app.deploy to cause a release.delete
         """
         app_id = self.create_app()
+        app = App.objects.get(id=app_id)
 
         # deploy app to get a build
         url = "/v2/apps/{}/builds".format(app_id)
@@ -277,19 +278,27 @@ def test_release_rollback_failure(self, mock_requests):
         response = self.client.post(url, body)
         self.assertEqual(response.status_code, 201, response.data)
 
-        # update config to roll a new release
-        url = '/v2/apps/{}/config'.format(app_id)
-        body = {'values': json.dumps({'NEW_URL2': 'http://localhost:8080/'})}
-        response = self.client.post(url, body)
-        self.assertEqual(response.status_code, 201, response.data)
-
         # app.deploy exception
         with mock.patch('api.models.App.deploy') as mock_deploy:
             mock_deploy.side_effect = Exception('Boom!')
             url = "/v2/apps/{}/releases/rollback/".format(app_id)
             body = {'version': 2}
             response = self.client.post(url, body)
             self.assertEqual(response.status_code, 400, response.data)
+            self.assertEqual(app.release_set.latest().version, 4)
+
+        # update config to roll a new release
+        url = '/v2/apps/{}/config'.format(app_id)
+        body = {'values': json.dumps({'NEW_URL2': 'http://localhost:8080/'})}
+        response = self.client.post(url, body)
+        self.assertEqual(response.status_code, 201, response.data)
+
+        # try to rollback to v4 and verify that the rollback failed
+        # (v4 is a failed release)
+        url = "/v2/apps/{app_id}/releases/rollback/".format(**locals())
+        body = {'version': 4}
+        response = self.client.post(url, body)
+        self.assertContains(response, 'Cannot roll back to failed release.', status_code=400)
 
         # app.deploy exception followed by a KubeHTTPException of 404
         with mock.patch('api.models.App.deploy') as mock_deploy: