2025-summer/team-3
12
Fork 0
Code Issues Pull requests Projects Releases Activity

fix editor/mapdaza deadlock during processupdates, halleluja! [hopefully]

Browse source
This commit is contained in:
Laura Klünder 2024-12-16 09:08:43 +00:00
parent 5d6cf7e052
commit bf1b6c395d
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/c3nav/mapdata/models/update.py
View file

@ -2,7 +2,7 @@ import logging
import os import os
import pickle import pickle
import time import time
from contextlib import contextmanager, suppress from contextlib import contextmanager, suppress, nullcontext
from functools import cached_property from functools import cached_property
from sqlite3 import DatabaseError from sqlite3 import DatabaseError
@ -61,13 +61,13 @@ class MapUpdate(models.Model):
return last_update return last_update
@classmethod @classmethod
def last_processed_update(cls, force=False): def last_processed_update(cls, force=False, lock=True):
if not force: if not force:
last_processed_update = cache.get('mapdata:last_processed_update', None) last_processed_update = cache.get('mapdata:last_processed_update', None)
if last_processed_update is not None: if last_processed_update is not None:
return last_processed_update return last_processed_update
try: try:
with cls.lock(): with (cls.lock() if lock else nullcontext()):
last_processed_update = cls.objects.filter(processed=True).latest().to_tuple last_processed_update = cls.objects.filter(processed=True).latest().to_tuple
cache.set('mapdata:last_processed_update', last_processed_update, None) cache.set('mapdata:last_processed_update', last_processed_update, None)
except cls.DoesNotExist: except cls.DoesNotExist:
@ -214,7 +214,7 @@ class MapUpdate(models.Model):
logger.info('%.3f m² of altitude areas affected.' % changed_geometries.area) logger.info('%.3f m² of altitude areas affected.' % changed_geometries.area)
last_processed_update = cls.last_processed_update(force=True) last_processed_update = cls.last_processed_update(force=True, lock=False)
for new_update in new_updates: for new_update in new_updates:
logger.info('Applying changed geometries from MapUpdate #%(id)s (%(type)s)...' % logger.info('Applying changed geometries from MapUpdate #%(id)s (%(type)s)...' %