From 7d846e870422c65f3fb436e5b0e543dae17719fc Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Fri, 31 Jan 2020 09:49:13 +0000
Subject: [PATCH] Fix bug with getting missing auth event during join 500'ed
 (#6810)

---
 changelog.d/6810.misc          | 1 +
 synapse/handlers/federation.py | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 changelog.d/6810.misc

diff --git a/changelog.d/6810.misc b/changelog.d/6810.misc
new file mode 100644
index 000000000000..5537355bea8e
--- /dev/null
+++ b/changelog.d/6810.misc
@@ -0,0 +1 @@
+Record room versions in the `rooms` table.
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py
index 01372f6d4766..1f92640f8637 100644
--- a/synapse/handlers/federation.py
+++ b/synapse/handlers/federation.py
@@ -1929,7 +1929,11 @@ def _persist_auth_tree(
 
         for e_id in missing_auth_events:
             m_ev = yield self.federation_client.get_pdu(
-                [origin], e_id, room_version=room_version, outlier=True, timeout=10000
+                [origin],
+                e_id,
+                room_version=room_version.identifier,
+                outlier=True,
+                timeout=10000,
             )
             if m_ev and m_ev.event_id == e_id:
                 event_map[e_id] = m_ev