Merge "db: Migrate "snapshot metadata" APIs to enginefacade"

cinder/db/sqlalchemy/api.py

@@ -4136,15 +4136,15 @@ def get_snapshot_summary(context, project_only, filters=None):
 ####################
 
 
-def _snapshot_metadata_get_query(context, snapshot_id, session=None):
+def _snapshot_metadata_get_query(context, snapshot_id):
-    return model_query(context, models.SnapshotMetadata,
+    return model_query(
-                       session=session, read_deleted="no").\
+        context, models.SnapshotMetadata, read_deleted="no"
-        filter_by(snapshot_id=snapshot_id)
+    ).filter_by(snapshot_id=snapshot_id)
 
 
 @require_context
-def _snapshot_metadata_get(context, snapshot_id, session=None):
+def _snapshot_metadata_get(context, snapshot_id):
-    rows = _snapshot_metadata_get_query(context, snapshot_id, session).all()
+    rows = _snapshot_metadata_get_query(context, snapshot_id).all()
     result = {}
     for row in rows:
         result[row['key']] = row['value']
@@ -4154,6 +4154,7 @@ def _snapshot_metadata_get(context, snapshot_id, session=None):
 
 @require_context
 @require_snapshot_exists
+@main_context_manager.reader
 def snapshot_metadata_get(context, snapshot_id):
     return _snapshot_metadata_get(context, snapshot_id)
 
@@ -4161,26 +4162,33 @@ def snapshot_metadata_get(context, snapshot_id):
 @require_context
 @require_snapshot_exists
 @oslo_db_api.wrap_db_retry(max_retries=5, retry_on_deadlock=True)
+@main_context_manager.writer
 def snapshot_metadata_delete(context, snapshot_id, key):
-    query = _snapshot_metadata_get_query(context, snapshot_id).\
+    query = _snapshot_metadata_get_query(context, snapshot_id).filter_by(
-        filter_by(key=key)
+        key=key
+    )
     entity = query.column_descriptions[0]['entity']
-    query.update({'deleted': True,
+    query.update(
-                  'deleted_at': timeutils.utcnow(),
+        {
-                  'updated_at': entity.updated_at})
+            'deleted': True,
+            'deleted_at': timeutils.utcnow(),
+            'updated_at': entity.updated_at,
+        }
+    )
 
 
 @require_context
-def _snapshot_metadata_get_item(context, snapshot_id, key, session=None):
+def _snapshot_metadata_get_item(context, snapshot_id, key):
-    result = _snapshot_metadata_get_query(context,
+    result = (
-                                          snapshot_id,
+        _snapshot_metadata_get_query(context, snapshot_id)
-                                          session=session).\
+        .filter_by(key=key)
-        filter_by(key=key).\
+        .first()
-        first()
+    )
 
     if not result:
-        raise exception.SnapshotMetadataNotFound(metadata_key=key,
+        raise exception.SnapshotMetadataNotFound(
-                                                 snapshot_id=snapshot_id)
+            metadata_key=key, snapshot_id=snapshot_id
+        )
     return result
 
 
@@ -4188,42 +4196,47 @@ def _snapshot_metadata_get_item(context, snapshot_id, key, session=None):
 @require_snapshot_exists
 @handle_db_data_error
 @oslo_db_api.wrap_db_retry(max_retries=5, retry_on_deadlock=True)
+@main_context_manager.writer
 def snapshot_metadata_update(context, snapshot_id, metadata, delete):
-    session = get_session()
+    # Set existing metadata to deleted if delete argument is True
-    with session.begin():
+    if delete:
-        # Set existing metadata to deleted if delete argument is True
+        original_metadata = _snapshot_metadata_get(context, snapshot_id)
-        if delete:
+        for meta_key, meta_value in original_metadata.items():
-            original_metadata = _snapshot_metadata_get(context, snapshot_id,
+            if meta_key not in metadata:
-                                                       session)
+                meta_ref = _snapshot_metadata_get_item(
-            for meta_key, meta_value in original_metadata.items():
+                    context,
-                if meta_key not in metadata:
+                    snapshot_id,
-                    meta_ref = _snapshot_metadata_get_item(context,
+                    meta_key,
-                                                           snapshot_id,
+                )
-                                                           meta_key, session)
+                meta_ref.update(
-                    meta_ref.update({'deleted': True,
+                    {
-                                     'deleted_at': timeutils.utcnow()})
+                        'deleted': True,
-                    meta_ref.save(session=session)
+                        'deleted_at': timeutils.utcnow(),
+                    }
+                )
+                meta_ref.save(context.session)
 
-        meta_ref = None
+    meta_ref = None
 
-        # Now update all existing items with new values, or create new meta
+    # Now update all existing items with new values, or create new meta
-        # objects
+    # objects
-        for meta_key, meta_value in metadata.items():
+    for meta_key, meta_value in metadata.items():
 
-            # update the value whether it exists or not
+        # update the value whether it exists or not
-            item = {"value": meta_value}
+        item = {"value": meta_value}
 
-            try:
+        try:
-                meta_ref = _snapshot_metadata_get_item(context, snapshot_id,
+            meta_ref = _snapshot_metadata_get_item(
-                                                       meta_key, session)
+                context, snapshot_id, meta_key
-            except exception.SnapshotMetadataNotFound:
+            )
-                meta_ref = models.SnapshotMetadata()
+        except exception.SnapshotMetadataNotFound:
-                item.update({"key": meta_key, "snapshot_id": snapshot_id})
+            meta_ref = models.SnapshotMetadata()
+            item.update({"key": meta_key, "snapshot_id": snapshot_id})
 
-            meta_ref.update(item)
+        meta_ref.update(item)
-            meta_ref.save(session=session)
+        meta_ref.save(context.session)
 
-    return snapshot_metadata_get(context, snapshot_id)
+    return _snapshot_metadata_get(context, snapshot_id)
 
 ###################