Skip to content
Snippets Groups Projects
Commit 8b6ff1db authored by Erik Johnston's avatar Erik Johnston
Browse files

Revert "Also handle invalid event errors"

This reverts commit b4d0356e.
parent b4d0356e
No related branches found
No related tags found
No related merge requests found
...@@ -41,10 +41,7 @@ from synapse.storage.databases.main.events import ( ...@@ -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 ...@@ -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 ...@@ -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,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment