summary refs log tree commit diff
path: root/synapse/handlers/federation.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2017-04-28 11:26:46 +0100
committerErik Johnston <erik@matrix.org>2017-04-28 11:26:46 +0100
commit3a9f5bf6ddb9393b68d8da9f04b2b1162720da7b (patch)
treec74018b48a7d700c9778857e15b8b80410c34041 /synapse/handlers/federation.py
parentMerge pull request #2163 from matrix-org/erikj/fix_invite_state (diff)
downloadsynapse-3a9f5bf6ddb9393b68d8da9f04b2b1162720da7b.tar.xz
Don't fetch state for missing events that we fetched
Diffstat (limited to '')
-rw-r--r--synapse/handlers/federation.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py
index ebbf844489..33321699a6 100644
--- a/synapse/handlers/federation.py
+++ b/synapse/handlers/federation.py
@@ -171,6 +171,12 @@ class FederationHandler(BaseHandler):
                         yield self._get_missing_events_for_pdu(
                             origin, pdu, prevs, min_depth
                         )
+
+                        # Update the set of things we've seen after trying to
+                        # fetch the missing stuff
+                        have_seen = yield self.store.have_events(
+                            [ev for ev, _ in pdu.prev_events]
+                        )
                 elif prevs - seen:
                     logger.info(
                         "Not fetching %d missing events for room %r,event %s: %r...",