mirror of
https://github.com/element-hq/synapse
synced 2024-09-12 04:45:11 +00:00
Merge pull request #985 from matrix-org/erikj/fix_integrity_retry
Tweak integrity error recovery to work as intended
This commit is contained in:
commit
87ef315ad5
2 changed files with 9 additions and 1 deletions
|
@ -343,7 +343,7 @@ class FederationClient(FederationBase):
|
||||||
|
|
||||||
defer.returnValue((pdus, auth_chain))
|
defer.returnValue((pdus, auth_chain))
|
||||||
except HttpResponseException as e:
|
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")
|
logger.info("Failed to use get_room_state_ids API, falling back")
|
||||||
else:
|
else:
|
||||||
raise e
|
raise e
|
||||||
|
|
|
@ -580,6 +580,7 @@ class EventsStore(SQLBaseStore):
|
||||||
|
|
||||||
for table in (
|
for table in (
|
||||||
"events",
|
"events",
|
||||||
|
"event_auth",
|
||||||
"event_json",
|
"event_json",
|
||||||
"event_content_hashes",
|
"event_content_hashes",
|
||||||
"event_destinations",
|
"event_destinations",
|
||||||
|
@ -591,8 +592,15 @@ class EventsStore(SQLBaseStore):
|
||||||
"event_search",
|
"event_search",
|
||||||
"event_signatures",
|
"event_signatures",
|
||||||
"event_to_state_groups",
|
"event_to_state_groups",
|
||||||
|
"guest_access",
|
||||||
|
"history_visibility",
|
||||||
|
"local_invites",
|
||||||
|
"room_names",
|
||||||
|
"state_events",
|
||||||
"rejections",
|
"rejections",
|
||||||
"redactions",
|
"redactions",
|
||||||
|
"room_memberships",
|
||||||
|
"state_events"
|
||||||
):
|
):
|
||||||
txn.executemany(
|
txn.executemany(
|
||||||
"DELETE FROM %s WHERE event_id = ?" % (table,),
|
"DELETE FROM %s WHERE event_id = ?" % (table,),
|
||||||
|
|
Loading…
Reference in a new issue