Pass through list of room hosts from room alias query to federation so that it can retry against different room hosts

1 files changed, 4 insertions, 1 deletions

diff --git a/synapse/federation/federation_client.py b/synapse/federation/federation_client.py

index eb36ec040b..9923b3fc0d 100644
--- a/synapse/federation/federation_client.py
+++ b/synapse/federation/federation_client.py
@@ -264,7 +264,9 @@ class FederationClient(FederationBase):
 
                 logger.debug("Got response to make_join: %s", pdu_dict)
 
-                defer.returnValue(self.event_from_pdu_json(pdu_dict))
+                defer.returnValue(
+                    (destination, self.event_from_pdu_json(pdu_dict))
+                )
                 break
             except CodeMessageException:
                 raise
@@ -313,6 +315,7 @@ class FederationClient(FederationBase):
                 defer.returnValue({
                     "state": signed_state,
                     "auth_chain": signed_auth,
+                    "origin": destination,
                 })
             except CodeMessageException:
                 raise