Merge pull request #655 from rohanpm/deadlock-ordering

Use ordered queries to reduce deadlocks [RHELDST-22078]

exodus_gw/models/publish.py

@@ -74,6 +74,7 @@ def resolve_links(
                     func.coalesce(Item.link_to, "")  # pylint: disable=E1102
                     != ""
                 )
+                .order_by(Item.web_uri)
                 .all()
             )
         else:

exodus_gw/routers/publish.py

@@ -271,6 +271,7 @@ def update_publish_items(
                 [i.web_uri for i in items if not i.link_to]
             )
         )
+        .order_by(models.Item.web_uri)
         .all()
     )
 
@@ -290,6 +291,7 @@ def update_publish_items(
         }
         for item in items
     ]
+    items_data.sort(key=lambda item: item["web_uri"])
 
     LOG.debug(
         "Adding %s items into '%s'",

exodus_gw/worker/publish.py

@@ -234,8 +234,10 @@ def item_select(self):
         # Returns base of the SELECT query to find all items for commit.
         #
         # Can be overridden in subclasses.
-        return select(Item).where(
-            Item.publish_id == self.publish.id, Item.dirty == True
+        return (
+            select(Item)
+            .where(Item.publish_id == self.publish.id, Item.dirty == True)
+            .order_by(Item.web_uri)
         )
 
     @property