Avoid deadlocks on Santa target upserts

zentralopensource · Sep 4, 2024 · 151c483 · 151c483
1 parent 308b00b
commit 151c483
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/zentral/contrib/santa/utils.py b/zentral/contrib/santa/utils.py
@@ -138,10 +138,12 @@ def update_or_create_targets(configuration, targets):
     with connection.cursor() as cursor:
         result = psycopg2.extras.execute_values(
             cursor, query,
-            ((target_type, target_identifier, configuration.id,
+            sorted(
+             (target_type, target_identifier, configuration.id,
               val["blocked_incr"], val["collected_incr"], val["executed_incr"],
               datetime.utcnow())
-             for (target_type, target_identifier), val in targets.items()),
+             for (target_type, target_identifier), val in targets.items()
+            ),
             fetch=True
         )
         columns = [c.name for c in cursor.description]