mirrors/synapse
1
0
Fork 0
mirror of https://github.com/element-hq/synapse.git synced 2024-11-24 02:25:45 +03:00
Code Issues Projects Releases Packages Wiki Activity

Revert "Also handle invalid event errors"

Browse source 
This reverts commit b4d0356e48.
This commit is contained in:
Erik Johnston 2024-09-01 10:43:26 +01:00
parent b4d0356e48
commit 8b6ff1dba5
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
synapse/storage/databases/main/events_bg_updates.py
View file

@ -41,10 +41,7 @@ from synapse.storage.databases.main.events import (
SlidingSyncMembershipSnapshotSharedInsertValues, SlidingSyncMembershipSnapshotSharedInsertValues,
SlidingSyncStateInsertValues, SlidingSyncStateInsertValues,
) )
from synapse.storage.databases.main.events_worker import ( from synapse.storage.databases.main.events_worker import DatabaseCorruptionError
DatabaseCorruptionError,
InvalidEventError,
)
from synapse.storage.databases.main.state_deltas import StateDeltasStore from synapse.storage.databases.main.state_deltas import StateDeltasStore
from synapse.storage.databases.main.stream import StreamWorkerStore from synapse.storage.databases.main.stream import StreamWorkerStore
from synapse.storage.types import Cursor from synapse.storage.types import Cursor
@ -2093,7 +2090,7 @@ class EventsBackgroundUpdatesStore(StreamWorkerStore, StateDeltasStore, SQLBaseS
fetched_events = await self.get_events( fetched_events = await self.get_events(
current_state_ids_map.values() current_state_ids_map.values()
) )
except (DatabaseCorruptionError, InvalidEventError) as e: except DatabaseCorruptionError as e:
logger.warning( logger.warning(
"Failed to fetch state for room '%s' due to corrupted events. Ignoring. Error: %s", "Failed to fetch state for room '%s' due to corrupted events. Ignoring. Error: %s",
room_id, room_id,
@ -2200,7 +2197,7 @@ class EventsBackgroundUpdatesStore(StreamWorkerStore, StateDeltasStore, SQLBaseS
try: try:
fetched_events = await self.get_events(state_ids_map.values()) fetched_events = await self.get_events(state_ids_map.values())
except (DatabaseCorruptionError, InvalidEventError) as e: except DatabaseCorruptionError as e:
logger.warning( logger.warning(
"Failed to fetch state for room '%s' due to corrupted events. Ignoring. Error: %s", "Failed to fetch state for room '%s' due to corrupted events. Ignoring. Error: %s",
room_id, room_id,