diff options
| author | Benjamin Saunders <ben.e.saunders@gmail.com> | 2016-08-04 20:38:08 -0700 |
|---|---|---|
| committer | Benjamin Saunders <ben.e.saunders@gmail.com> | 2016-08-04 20:38:08 -0700 |
| commit | a2b7102eea23572c8a3619704f5f5c3f21a8edcd (patch) | |
| tree | c36df46b44c7053ff6b9d8e22706ffa8e4bf97b6 | |
| parent | Merge pull request #973 from matrix-org/erikj/xpath_fix (diff) | |
| download | synapse-a2b7102eea23572c8a3619704f5f5c3f21a8edcd.tar.xz | |
Tweak integrity error recovery to work as intended
| -rw-r--r-- | synapse/federation/federation_client.py | 2 | ||||
| -rw-r--r-- | synapse/storage/events.py | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/synapse/federation/federation_client.py b/synapse/federation/federation_client.py index c6ed720166..c5e99cebf7 100644 --- a/synapse/federation/federation_client.py +++ b/synapse/federation/federation_client.py @@ -343,7 +343,7 @@ class FederationClient(FederationBase): defer.returnValue((pdus, auth_chain)) except HttpResponseException as e: - if e.code == 404: + if e.code == 400: 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 index 340c0621cc..643c3aed2a 100644 --- a/synapse/storage/events.py +++ b/synapse/storage/events.py @@ -580,6 +580,7 @@ class EventsStore(SQLBaseStore): for table in ( "events", + "event_auth", "event_json", "event_content_hashes", "event_destinations", @@ -593,6 +594,8 @@ class EventsStore(SQLBaseStore): "event_to_state_groups", "rejections", "redactions", + "room_memberships", + "state_events" ): txn.executemany( "DELETE FROM %s WHERE event_id = ?" % (table,), |