summary refs log tree commit diff
path: root/synapse/federation/federation_server.py
diff options
context:
space:
mode:
authorMatthew Hodgson <matthew@matrix.org>2016-12-31 02:38:26 +0000
committerMatthew Hodgson <matthew@matrix.org>2016-12-31 02:38:26 +0000
commit899a3a126857e94a16fda65cd11b5b5c4efeed01 (patch)
tree56e3527cd9e9c62a71cee6d9064d3704f0e11ef2 /synapse/federation/federation_server.py
parentMerge remote-tracking branch 'origin/release-v0.18.6' into develop (diff)
parentBump version and changelog (diff)
downloadsynapse-899a3a126857e94a16fda65cd11b5b5c4efeed01.tar.xz
Merge branch 'release-v0.18.6' into develop
Diffstat (limited to 'synapse/federation/federation_server.py')
-rw-r--r--synapse/federation/federation_server.py9
1 files changed, 9 insertions, 0 deletions
diff --git a/synapse/federation/federation_server.py b/synapse/federation/federation_server.py
index 3fa7b2315c..f4c60e67e3 100644
--- a/synapse/federation/federation_server.py
+++ b/synapse/federation/federation_server.py
@@ -538,7 +538,16 @@ class FederationServer(FederationBase):
                 if get_missing and prevs - seen:
                     # If we're missing stuff, ensure we only fetch stuff one
                     # at a time.
+                    logger.info(
+                        "Acquiring lock for room %r to fetch %d missing events: %r...",
+                        pdu.room_id, len(prevs - seen), list(prevs - seen)[:5],
+                    )
                     with (yield self._room_pdu_linearizer.queue(pdu.room_id)):
+                        logger.info(
+                            "Acquired lock for room %r to fetch %d missing events",
+                            pdu.room_id, len(prevs - seen),
+                        )
+
                         # We recalculate seen, since it may have changed.
                         have_seen = yield self.store.have_events(prevs)
                         seen = set(have_seen.keys())