Merge pull request #1245 from rapidpro/squash-contact-activities-coun…

…ts-with-lock

Add lock to run the contacts activities squash once

ureport/polls/tasks.py

@@ -325,7 +325,7 @@ def polls_stats_squash():
     from ureport.stats.models import PollStats
 
     r = get_redis_connection()
-    key = "squesh_stats_lock"
+    key = "squash_stats_lock"
 
     lock_timeout = 60 * 60 * 2
 

ureport/stats/tasks.py

@@ -2,6 +2,8 @@
 import time
 from datetime import timedelta
 
+from django_redis import get_redis_connection
+
 from django.utils import timezone
 
 from dash.orgs.models import Org
@@ -70,7 +72,16 @@ def delete_old_contact_activities(org, since, until):
 def squash_contact_activities_counts():
     from .models import ContactActivityCounter
 
-    ContactActivityCounter.squash()
+    r = get_redis_connection()
+    key = "squash_contact_activity_counts_lock"
+
+    lock_timeout = 60 * 60
+
+    if r.get(key):
+        logger.info("Skipping squashing contact activity counts as it is still running")
+    else:
+        with r.lock(key, timeout=lock_timeout):
+            ContactActivityCounter.squash()
 
 
 @app.task(name="stats.rebuild_contacts_activities_counts")

ureport/utils/models.py

@@ -35,7 +35,7 @@ def squash(cls):
 
         time_taken = time.time() - start
 
-        logging.debug("Squashed %d distinct sets of %s in %0.3fs" % (num_sets, cls.__name__, time_taken))
+        logging.info("Squashed %d distinct sets of %s in %0.3fs" % (num_sets, cls.__name__, time_taken))
 
     @classmethod
     @abstractmethod