Merge lp:~jtv/maas/1.5-isolation into lp:maas/1.5

[Jeroen T. Vermeulen]

Backport trunk r2306: Raise isolation level from the default Read Committed to Serializable. Django 1.6 added support. In situations where previously you'd get potentially incorrect updates, you will now get an OperationalError.

Trivial backport. Will self-approve.

Jeroen

[Jeroen T. Vermeulen (jtv)]

Self-approving.

review: Approve

=== modified file 'src/maas/development.py'
--- src/maas/development.py	2014-01-09 12:50:53 +0000
+++ src/maas/development.py	2014-05-07 22:26:56 +0000
@@ -24,6 +24,7 @@
     )
 from metadataserver.address import guess_server_address
 import provisioningserver.config
+from psycopg2.extensions import ISOLATION_LEVEL_SERIALIZABLE
 
 # We expect the following settings to be overridden. They are mentioned here
 # to silence lint warnings.
@@ -68,7 +69,10 @@
         # For PostgreSQL, a "hostname" starting with a slash indicates a
         # Unix socket directory.
         'HOST': abspath('db'),
-    }
+        'OPTIONS': {
+            'isolation_level': ISOLATION_LEVEL_SERIALIZABLE,
+        },
+    },
 }
 
 # Absolute filesystem path to the directory that will hold user-uploaded files.

=== modified file 'src/maas/settings.py'
--- src/maas/settings.py	2014-05-05 07:45:06 +0000
+++ src/maas/settings.py	2014-05-07 22:26:56 +0000
@@ -21,6 +21,7 @@
 import django.template
 from maas import import_local_settings
 from metadataserver.address import guess_server_address
+from psycopg2.extensions import ISOLATION_LEVEL_SERIALIZABLE
 
 
 django.template.add_to_builtins('django.templatetags.future')
@@ -138,7 +139,10 @@
         # Unix socket directory.
         'HOST': '',
         'PORT': '',
-    }
+        'OPTIONS': {
+            'isolation_level': ISOLATION_LEVEL_SERIALIZABLE,
+        },
+    },
 }
 
 # Local time zone for this installation. Choices can be found here: