Merge "Use oslo_db for create_engine"

requirements.txt

@@ -17,6 +17,7 @@ six>=1.9.0 # MIT
 oslo.cache>=1.5.0 # Apache-2.0
 oslo.config>=4.0.0 # Apache-2.0
 oslo.context>=2.14.0 # Apache-2.0
+oslo.db>=4.21.1 # Apache-2.0
 oslo.i18n!=3.15.2,>=2.1.0 # Apache-2.0
 oslo.log>=3.22.0 # Apache-2.0
 oslo.messaging!=5.25.0,>=5.24.2 # Apache-2.0

zaqar/storage/sqlalchemy/catalogue.py

@@ -22,6 +22,7 @@ project: string
 queue: string
 """
 
+import oslo_db.exception
 import sqlalchemy as sa
 
 from zaqar.storage import base
@@ -70,7 +71,9 @@ class CatalogueController(base.CatalogueBase):
             )
             self.driver.run(stmt)
 
-        except sa.exc.IntegrityError:
+        except oslo_db.exception.DBReferenceError:
+            self._update(project, queue, pool)
+        except oslo_db.exception.DBDuplicateError:
             self._update(project, queue, pool)
 
     def delete(self, project, queue):

zaqar/storage/sqlalchemy/driver.py

@@ -13,6 +13,7 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
+from oslo_db.sqlalchemy import engines
 from osprofiler import profiler
 from osprofiler import sqlalchemy as sa_tracer
 import sqlalchemy as sa
@@ -31,11 +32,6 @@ class ControlDriver(storage.ControlDriverBase):
                                 group=options.MANAGEMENT_SQLALCHEMY_GROUP)
         self.sqlalchemy_conf = self.conf[options.MANAGEMENT_SQLALCHEMY_GROUP]
 
-    def _sqlite_on_connect(self, conn, record):
-        # NOTE(flaper87): This is necessary in order
-        # to ensure FK are treated correctly by sqlite.
-        conn.execute('pragma foreign_keys=ON')
-
     def _mysql_on_connect(self, conn, record):
         # NOTE(flaper87): This is necessary in order
         # to ensure that all date operations in mysql
@@ -43,18 +39,16 @@ class ControlDriver(storage.ControlDriverBase):
         conn.query('SET time_zone = "+0:00"')
 
     @decorators.lazy_property(write=False)
-    def engine(self, *args, **kwargs):
+    def engine(self):
         uri = self.sqlalchemy_conf.uri
-        engine = sa.create_engine(uri, **kwargs)
+        engine = engines.create_engine(uri, sqlite_fk=True)
-
-        # TODO(flaper87): Find a better way
-        # to do this.
-        if uri.startswith('sqlite://'):
-            sa.event.listen(engine, 'connect',
-                            self._sqlite_on_connect)
 
         if (uri.startswith('mysql://') or
                 uri.startswith('mysql+pymysql://')):
+            # oslo_db.create_engine makes a test connection, throw that out
+            # first.   mysql time_zone can be added to oslo_db as a
+            # startup option
+            engine.dispose()
             sa.event.listen(engine, 'connect',
                             self._mysql_on_connect)
 

zaqar/storage/sqlalchemy/flavors.py

@@ -17,6 +17,7 @@ controller for sqlalchemy.
 
 """
 
+import oslo_db.exception
 import sqlalchemy as sa
 
 from zaqar.storage import base
@@ -80,7 +81,7 @@ class FlavorsController(base.FlavorsBase):
                 capabilities=cap
             )
             self.driver.run(stmt)
-        except sa.exc.IntegrityError:
+        except oslo_db.exception.DBDuplicateEntry:
             if not self._pools_ctrl.get_pools_by_group(pool_group):
                 raise errors.PoolGroupDoesNotExist(pool_group)
 

zaqar/storage/sqlalchemy/pools.py

@@ -19,6 +19,7 @@ controller for sqlalchemy.
 
 import functools
 
+import oslo_db.exception
 import sqlalchemy as sa
 
 from zaqar.common import utils as common_utils
@@ -81,7 +82,7 @@ class PoolsController(base.PoolsBase):
             stmt = sa.sql.expression.insert(tables.PoolGroup).values(name=name)
             self.driver.run(stmt)
             return True
-        except sa.exc.IntegrityError:
+        except oslo_db.exception.DBDuplicateEntry:
             return False
 
     # TODO(cpp-cabrera): rename to upsert
@@ -98,7 +99,7 @@ class PoolsController(base.PoolsBase):
             )
             self.driver.run(stmt)
 
-        except sa.exc.IntegrityError:
+        except oslo_db.exception.DBDuplicateEntry:
             # TODO(cpp-cabrera): merge update/create into a single
             # method with introduction of upsert
             self._update(name, weight=weight, uri=uri,

zaqar/storage/sqlalchemy/queues.py

@@ -12,6 +12,7 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
+import oslo_db.exception
 import sqlalchemy as sa
 
 from zaqar import storage
@@ -85,7 +86,7 @@ class QueueController(storage.Queue):
                                                 name=name,
                                                 metadata=smeta)
             res = self.driver.run(ins)
-        except sa.exc.IntegrityError:
+        except oslo_db.exception.DBDuplicateEntry:
             return False
 
         return res.rowcount == 1