Use directory server for room joins (#3899)

When we do a join, always try the server we used for the alias lookup first. Fixes #2418
matrix-org · Sep 18, 2018 · a219ce8 · a219ce8
1 parent 31c15dc
commit a219ce8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/changelog.d/3899.bugfix b/changelog.d/3899.bugfix
@@ -0,0 +1 @@
+When we join a room, always try the server we used for the alias lookup first, to avoid unresponsive and out-of-date servers.
diff --git a/synapse/handlers/room_member.py b/synapse/handlers/room_member.py
@@ -583,6 +583,11 @@ def lookup_room_alias(self, room_alias):
         room_id = mapping["room_id"]
         servers = mapping["servers"]
 
+        # put the server which owns the alias at the front of the server list.
+        if room_alias.domain in servers:
+            servers.remove(room_alias.domain)
+        servers.insert(0, room_alias.domain)
+
         defer.returnValue((RoomID.from_string(room_id), servers))
 
     @defer.inlineCallbacks
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		When we join a room, always try the server we used for the alias lookup first, to avoid unresponsive and out-of-date servers.