Merge pull request #537 from opdemand/474-atomic-requests

Enabled Django ATOMIC_REQUESTS, fixes #474.

Author: mboersma

api/views.py

@@ -9,7 +9,6 @@
 from Crypto.PublicKey import RSA
 from django.contrib.auth.models import AnonymousUser
 from django.contrib.auth.models import User
-from django.db import transaction
 from django.utils import timezone
 from guardian.shortcuts import assign_perm
 from guardian.shortcuts import get_objects_for_user
@@ -626,11 +625,10 @@ def rollback(self, request, *args, **kwargs):
         if version < 1:
             return Response(status=status.HTTP_404_NOT_FOUND)
         prev = app.release_set.get(version=version)
-        with transaction.atomic():
-            summary = "{} rolled back to v{}".format(request.user, version)
-            app.release_set.create(owner=request.user, version=last_version + 1,
-                                   build=prev.build, config=prev.config,
-                                   summary=summary)
+        summary = "{} rolled back to v{}".format(request.user, version)
+        app.release_set.create(owner=request.user, version=last_version + 1,
+                               build=prev.build, config=prev.config,
+                               summary=summary)
         # publish release to registry as new docker image
         if settings.REGISTRY_URL:
             repository_path = "{}/{}".format(app.owner.username, app.id)

deis/settings.py

@@ -329,3 +329,6 @@
     from .local_settings import *  # @UnusedWildImport # noqa
 except ImportError:
     pass
+
+# Ensure that atomic DB transactions per view are enabled
+DATABASES['default']['ATOMIC_REQUESTS'] = True