Merge pull request #2365 from matrix-org/erikj/push_skip_lock

Push: Don't acquire lock unless necessary
2017-07-13 11:44:49 +01:00 · 2017-07-13 11:44:49 +01:00 · 67b7b904ba
parent 91818723a1 f60218ec41
commit 67b7b904ba
1 changed files with 4 additions and 0 deletions
--- a/synapse/push/bulk_push_rule_evaluator.py
+++ b/synapse/push/bulk_push_rule_evaluator.py
@ -213,6 +213,10 @@ class RulesForRoom(object):
        """
        state_group = context.state_group

+        if state_group and self.state_group == state_group:
+            logger.debug("Using cached rules for %r", self.room_id)
+            defer.returnValue(self.rules_by_user)
+
        with (yield self.linearizer.queue(())):
            if state_group and self.state_group == state_group:
                logger.debug("Using cached rules for %r", self.room_id)