Run periodic tasks before handling tasks

servicelayer/taskqueue.py

@@ -411,6 +411,7 @@ def process_blocking(self):
         """Blocking worker thread - executes tasks from a queue and periodic tasks"""
         while True:
             try:
+                self.periodic()
                 (task, channel, connection) = self.local_queue.get(timeout=TIMEOUT)
                 apply_task_context(task, v=self.version)
                 self.handle(task)
@@ -420,7 +421,6 @@ def process_blocking(self):
                 pass
             finally:
                 clear_contextvars()
-                self.periodic()
 
     def process_nonblocking(self):
         """Non-blocking worker is used for tests only."""