Merge pull request #985 from matrix-org/erikj/fix_integrity_retry

Tweak integrity error recovery to work as intended
matrix-org · Aug 5, 2016 · 87ef315 · 87ef315
2 parents a5d7968 + f0fa66f
commit 87ef315
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/synapse/federation/federation_client.py b/synapse/federation/federation_client.py
@@ -343,7 +343,7 @@ def get_state_for_room(self, destination, room_id, event_id):
 
             defer.returnValue((pdus, auth_chain))
         except HttpResponseException as e:
-            if e.code == 404:
+            if e.code == 400 or e.code == 404:
                 logger.info("Failed to use get_room_state_ids API, falling back")
             else:
                 raise e

diff --git a/synapse/storage/events.py b/synapse/storage/events.py
@@ -580,6 +580,7 @@ def event_dict(event):
 
             for table in (
                 "events",
+                "event_auth",
                 "event_json",
                 "event_content_hashes",
                 "event_destinations",
@@ -591,8 +592,15 @@ def event_dict(event):
                 "event_search",
                 "event_signatures",
                 "event_to_state_groups",
+                "guest_access",
+                "history_visibility",
+                "local_invites",
+                "room_names",
+                "state_events",
                 "rejections",
                 "redactions",
+                "room_memberships",
+                "state_events"
             ):
                 txn.executemany(
                     "DELETE FROM %s WHERE event_id = ?" % (table,),