From 05f0ac85283d1e9b2ceddab525a293c03906abc4 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Thu, 27 Oct 2022 13:55:43 +0200 Subject: Geodata save: transaction for main_geodata assignation to limit deadlocks --- ishtar_common/models_common.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'ishtar_common/models_common.py') diff --git a/ishtar_common/models_common.py b/ishtar_common/models_common.py index 6330742a3..1c77d1a90 100644 --- a/ishtar_common/models_common.py +++ b/ishtar_common/models_common.py @@ -36,7 +36,7 @@ from django.core.files import File from django.core.serializers import serialize from django.urls import reverse, NoReverseMatch from django.core.validators import validate_slug -from django.db import connection +from django.db import connection, transaction, OperationalError, IntegrityError from django.db.models import Q, Count, Max from django.db.models.signals import post_save, post_delete, m2m_changed from django.template import loader @@ -2724,8 +2724,13 @@ class GeographicItem(models.Model): using=using, update_fields=update_fields, ) - if self.main_geodata and not self.geodata.filter(pk=self.main_geodata.pk).count(): - self.geodata.add(self.main_geodata) + if self.main_geodata and not self.geodata.filter( + pk=self.main_geodata.pk).count(): + try: + with transaction.atomic(): + self.geodata.add(self.main_geodata) + except (OperationalError, IntegrityError): + pass elif not self.main_geodata and self.geodata.count(): # arbitrary associate the first to geodata self.main_geodata = self.geodata.order_by("pk").all()[0] -- cgit v1.2.3