Merge "Fix duplicate entries in share_server_backend_details"

manila/db/sqlalchemy/api.py

@@ -5181,18 +5181,42 @@ def share_server_get_all_unused_deletable(context, host, updated_before):
     return result
 
 
+def _share_server_backend_details_get_item(context,
+                                           share_server_id,
+                                           key, session=None):
+    result = (_share_server_backend_details_get_query(
+        context, share_server_id, session=session).filter_by(key=key).first())
+    if not result:
+        raise exception.ShareServerBackendDetailsNotFound()
+    return result
+
+
+def _share_server_backend_details_get_query(context,
+                                            share_server_id,
+                                            session=None):
+    return (model_query(
+        context, models.ShareServerBackendDetails, session=session,
+        read_deleted="no").
+        filter_by(share_server_id=share_server_id))
+
+
 @require_context
 @context_manager.writer
 def share_server_backend_details_set(context, share_server_id, server_details):
     _share_server_get(context, share_server_id)
 
     for meta_key, meta_value in server_details.items():
-        meta_ref = models.ShareServerBackendDetails()
-        meta_ref.update({
-            'key': meta_key,
-            'value': meta_value,
-            'share_server_id': share_server_id
-        })
+
+        # update the value whether it exists or not
+        item = {"value": meta_value}
+        try:
+            meta_ref = _share_server_backend_details_get_item(
+                context, share_server_id, meta_key, session=context.session)
+        except exception.ShareServerBackendDetailsNotFound:
+            meta_ref = models.ShareServerBackendDetails()
+            item.update({"key": meta_key, "share_server_id": share_server_id})
+
+        meta_ref.update(item)
         meta_ref.save(session=context.session)
     return server_details
 

manila/exception.py

@@ -305,6 +305,10 @@ class ShareServerNotReady(ManilaException):
                 "within %(time)s seconds.")
 
 
+class ShareServerBackendDetailsNotFound(NotFound):
+    message = _("Share server backend details does not exist.")
+
+
 class ServiceNotFound(NotFound):
     message = _("Service %(service_id)s could not be found.")
 

manila/tests/db/sqlalchemy/test_api.py

@@ -3596,6 +3596,14 @@ class ShareServerDatabaseAPITestCase(test.TestCase):
             db_api.share_server_get(self.ctxt, server['id'])['backend_details']
         )
 
+        details.update({'value2': '4'})
+        db_api.share_server_backend_details_set(self.ctxt, server['id'],
+                                                details)
+        self.assertDictEqual(
+            details,
+            db_api.share_server_get(self.ctxt, server['id'])['backend_details']
+        )
+
     def test_backend_details_set_not_found(self):
         fake_id = 'FAKE_UUID'
         self.assertRaises(exception.ShareServerNotFound,

releasenotes/notes/bug-2024658-fix-duplicate-entries-of-share-server-backend-details-adf45b417d45b437.yaml

@@ -0,0 +1,8 @@
+---
+fixes:
+  - |
+    Share server backend details set function adds db records without
+    checking existing entries. This results in duplicate records for the
+    combination of given share server id and key. Fixed it by updating records
+    if already exist else creating new. See the `launchpad bug 2024658
+    <https://bugs.launchpad.net/manila/+bug/2024658>`_ for more details.