Prevent incorrect transaction abort

wlanslovenija · Jun 29, 2017 · 27d784f · 27d784f
1 parent 88a2ace
commit 27d784f
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/datastream/backends/influxdb.py b/datastream/backends/influxdb.py
@@ -722,11 +722,14 @@ def _create_schema(self):
         with self._metadata:
             with self._metadata.cursor() as cursor:
                 try:
+                    cursor.execute('SAVEPOINT create_schema')
                     cursor.execute('CREATE SCHEMA IF NOT EXISTS datastream')
                 except psycopg2.IntegrityError:
                     # Ignore an integrity error while creating the datastream schema. This may
-                    # happen when the schema is created concurrently.
-                    pass
+                    # happen when the schema is created concurrently. We need to perform a rollback
+                    # as otherwise the transaction will be aborted and all further commands will
+                    # fail.
+                    cursor.execute('ROLLBACK TO SAVEPOINT create_schema')
 
                 # Streams table.
                 cursor.execute('''CREATE TABLE IF NOT EXISTS datastream.streams (