diff options
| author | Erik Johnston <erikj@element.io> | 2024-01-10 14:42:13 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-10 14:42:13 +0000 |
| commit | 0a96fa52a214d0cc707dbdf9693118ceddbfc150 (patch) | |
| tree | 1c1f8e9caab6bdbc040050d27227d0163bf4c8a3 /synapse/handlers | |
| parent | Bump anyhow from 1.0.75 to 1.0.79 (#16789) (diff) | |
| download | synapse-0a96fa52a214d0cc707dbdf9693118ceddbfc150.tar.xz | |
Pull less state out if we fail to backfill (#16788)
Sometimes we fail to fetch events during backfill due to missing state, and we often end up querying the same bad events periodically (as people backpaginate). In such cases its likely we will continue to fail to get the state, and therefore we should try *before* loading the state that we have from the DB (as otherwise it's wasted DB and memory). --------- Co-authored-by: reivilibre <oliverw@matrix.org>
Diffstat (limited to 'synapse/handlers')
| -rw-r--r-- | synapse/handlers/federation_event.py | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/synapse/handlers/federation_event.py b/synapse/handlers/federation_event.py index 398f19eec0..12837429b9 100644 --- a/synapse/handlers/federation_event.py +++ b/synapse/handlers/federation_event.py @@ -1141,16 +1141,8 @@ class FederationEventHandler: partial_state_flags = await self._store.get_partial_state_events(seen) partial_state = any(partial_state_flags.values()) - # Get the state of the events we know about - ours = await self._state_storage_controller.get_state_groups_ids( - room_id, seen, await_full_state=False - ) - # state_maps is a list of mappings from (type, state_key) to event_id - state_maps: List[StateMap[str]] = list(ours.values()) - - # we don't need this any more, let's delete it. - del ours + state_maps: List[StateMap[str]] = [] # Ask the remote server for the states we don't # know about @@ -1169,6 +1161,17 @@ class FederationEventHandler: state_maps.append(remote_state_map) + # Get the state of the events we know about. We do this *after* + # trying to fetch missing state over federation as that might fail + # and then we can skip loading the local state. + ours = await self._state_storage_controller.get_state_groups_ids( + room_id, seen, await_full_state=False + ) + state_maps.extend(ours.values()) + + # we don't need this any more, let's delete it. + del ours + room_version = await self._store.get_room_version_id(room_id) state_map = await self._state_resolution_handler.resolve_events_with_store( room_id, |