diff options
| author | Patrick Cloke <clokep@users.noreply.github.com> | 2023-01-23 06:36:20 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-23 11:36:20 +0000 |
| commit | 82d3efa3124f771579ba07553904f88625c443b0 (patch) | |
| tree | 2328fa096d36ea3806525c6988ac504127ffef33 /synapse/storage/databases/main/stats.py | |
| parent | Faster joins: Update room stats and the user directory on workers when finish... (diff) | |
| download | synapse-82d3efa3124f771579ba07553904f88625c443b0.tar.xz | |
Skip processing stats for broken rooms. (#14873)
* Skip processing stats for broken rooms. * Newsfragment * Use a custom exception.
Diffstat (limited to 'synapse/storage/databases/main/stats.py')
| -rw-r--r-- | synapse/storage/databases/main/stats.py | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/synapse/storage/databases/main/stats.py b/synapse/storage/databases/main/stats.py index 356d4ca788..0c1cbd540d 100644 --- a/synapse/storage/databases/main/stats.py +++ b/synapse/storage/databases/main/stats.py @@ -29,6 +29,7 @@ from synapse.storage.database import ( LoggingDatabaseConnection, LoggingTransaction, ) +from synapse.storage.databases.main.events_worker import InvalidEventError from synapse.storage.databases.main.state_deltas import StateDeltasStore from synapse.types import JsonDict from synapse.util.caches.descriptors import cached @@ -554,7 +555,17 @@ class StatsStore(StateDeltasStore): "get_initial_state_for_room", _fetch_current_state_stats ) - state_event_map = await self.get_events(event_ids, get_prev_content=False) # type: ignore[attr-defined] + try: + state_event_map = await self.get_events(event_ids, get_prev_content=False) # type: ignore[attr-defined] + except InvalidEventError as e: + # If an exception occurs fetching events then the room is broken; + # skip process it to avoid being stuck on a room. + logger.warning( + "Failed to fetch events for room %s, skipping stats calculation: %r.", + room_id, + e, + ) + return room_state: Dict[str, Union[None, bool, str]] = { "join_rules": None, |