Merge pull request #2421 from laws-africa/activity-deadlock

try to avoid deadlock

Author: longhotsummer

indigo_api/models/documents.py

@@ -815,6 +815,6 @@ def is_asleep(self):
         return (timezone.now() - self.updated_at).total_seconds() > self.ASLEEP_SECS
 
     @classmethod
-    def vacuum(cls, document):
+    def vacuum(cls):
         threshold = timezone.now() - datetime.timedelta(seconds=cls.DEAD_SECS)
-        cls.objects.filter(document=document, updated_at__lte=threshold).delete()
+        cls.objects.filter(updated_at__lte=threshold).delete()

indigo_api/tasks.py

@@ -12,7 +12,7 @@
 from django.db.utils import OperationalError
 from django.dispatch import receiver
 
-from indigo_api.models import Document
+from indigo_api.models import Document, DocumentActivity
 
 # get specific task logger
 log = logging.getLogger('indigo.tasks')
@@ -88,9 +88,23 @@ def prune_document_versions():
         raise e
 
 
+@background(queue="indigo", remove_existing_tasks=True)
+def prune_document_activity():
+    """ Prune out old DocumentActivity entries.
+    """
+    try:
+        DocumentActivity.vacuum()
+    except Exception as e:
+        log.error(f"Error pruning document activity: {e}", exc_info=e)
+        raise e
+
+
 def setup_pruning():
     # schedule task to run in 12 hours time, and repeat daily
-    prune_deleted_documents(schedule=timedelta(hours=12), repeat=Task.DAILY)
+    prune_deleted_documents(schedule=timedelta(hours=11), repeat=Task.DAILY)
 
     # schedule task to run in 12 hours time, and repeat daily
     prune_document_versions(schedule=timedelta(hours=12), repeat=Task.DAILY)
+
+    # schedule task to run in 12 hours time, and repeat daily
+    prune_document_activity(schedule=timedelta(hours=13), repeat=Task.DAILY)

indigo_api/views/documents.py

@@ -286,11 +286,6 @@ class DocumentActivityViewSet(DocumentResourceView,
     def get_queryset(self):
         return self.document.activities.prefetch_related('user').all()
 
-    def list(self, request, *args, **kwargs):
-        # clean up old activity
-        DocumentActivity.vacuum(self.document)
-        return super(DocumentActivityViewSet, self).list(request, *args, **kwargs)
-
     def create(self, request, *args, **kwargs):
         # if they've provided additional finished nonces, clear those out
         if request.data.get('finished_nonces'):