Mirrors
/
synapse-old
mirror of https://github.com/matrix-org/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

more comments

This commit is contained in:
Richard van der Hoff 2018-09-26 19:17:36 +01:00
parent ad8e137062
commit 28223841e0
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
synapse/federation/federation_client.py
View File

@ -209,8 +209,6 @@ class FederationClient(FederationBase):
Will attempt to get the PDU from each destination in the list until Will attempt to get the PDU from each destination in the list until
one succeeds. one succeeds.
This will persist the PDU locally upon receipt.
Args: Args:
destinations (list): Which home servers to query destinations (list): Which home servers to query
event_id (str): event to fetch event_id (str): event to fetch

7
synapse/handlers/federation.py
View File

@ -341,10 +341,9 @@ class FederationHandler(BaseHandler):
) )
with logcontext.nested_logging_context(p): with logcontext.nested_logging_context(p):
# XXX if any of the missing prevs share missing state or auth # note that if any of the missing prevs share missing state or
# events, we'll end up requesting those missing events for # auth events, the requests to fetch those events are deduped
# *each* missing prev, contributing to the hammering of /event # by the get_pdu_cache in federation_client.
# as per https://github.com/matrix-org/synapse/issues/2164.
remote_state, got_auth_chain = ( remote_state, got_auth_chain = (
yield self.federation_client.get_state_for_room( yield self.federation_client.get_state_for_room(
origin, room_id, p, origin, room_id, p,