diff options
| author | Richard van der Hoff <richard@matrix.org> | 2020-07-28 10:15:22 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2020-07-28 10:15:22 +0100 |
| commit | b2ccc72a00dd234432226b9cae6aee2223a2eef8 (patch) | |
| tree | 4e53a71c1de7245a79c67c441534d2757a4e54d6 /synapse/push | |
| parent | Merge branch 'develop' into matrix-org-hotfixes (diff) | |
| parent | Handle replication commands synchronously where possible (#7876) (diff) | |
| download | synapse-b2ccc72a00dd234432226b9cae6aee2223a2eef8.tar.xz | |
Merge branch 'release-v1.18.0' into matrix-org-hotfixes
Diffstat (limited to 'synapse/push')
| -rw-r--r-- | synapse/push/bulk_push_rule_evaluator.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/synapse/push/bulk_push_rule_evaluator.py b/synapse/push/bulk_push_rule_evaluator.py index 43ffe6faf0..472ddf9f7d 100644 --- a/synapse/push/bulk_push_rule_evaluator.py +++ b/synapse/push/bulk_push_rule_evaluator.py @@ -304,7 +304,9 @@ class RulesForRoom(object): push_rules_delta_state_cache_metric.inc_hits() else: - current_state_ids = yield context.get_current_state_ids() + current_state_ids = yield defer.ensureDeferred( + context.get_current_state_ids() + ) push_rules_delta_state_cache_metric.inc_misses() push_rules_state_size_counter.inc(len(current_state_ids)) |