From fd389968c2b278724dfaddbeea834915d812ef00 Mon Sep 17 00:00:00 2001 From: Eric Eastwood Date: Thu, 29 Sep 2022 22:04:00 -0500 Subject: [PATCH 1/3] Maybe not catch all errors to avoid things in the nature-of CancelledError See https://github.com/matrix-org/synapse/pull/13815#discussion_r983384698 --- synapse/handlers/federation_event.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/synapse/handlers/federation_event.py b/synapse/handlers/federation_event.py index 3fac256881d0..9a3706844d81 100644 --- a/synapse/handlers/federation_event.py +++ b/synapse/handlers/federation_event.py @@ -866,11 +866,6 @@ async def _process_pulled_event( event.room_id, event_id, str(err) ) return - except Exception as exc: - await self._store.record_event_failed_pull_attempt( - event.room_id, event_id, str(exc) - ) - raise exc try: try: @@ -913,7 +908,7 @@ async def _process_pulled_event( logger.warning("Pulled event %s failed history check.", event_id) else: raise - except Exception as exc: + except (FederationError, RuntimeError, InvalidResponseError) as exc: await self._store.record_event_failed_pull_attempt( event.room_id, event_id, str(exc) ) From 2d62a81cac590c7b4c63e825b37cdc2aa513538f Mon Sep 17 00:00:00 2001 From: Eric Eastwood Date: Fri, 30 Sep 2022 20:30:58 -0500 Subject: [PATCH 2/3] Remove general exception tracking --- synapse/handlers/federation_event.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/synapse/handlers/federation_event.py b/synapse/handlers/federation_event.py index 9a3706844d81..778d8869b3c7 100644 --- a/synapse/handlers/federation_event.py +++ b/synapse/handlers/federation_event.py @@ -908,11 +908,6 @@ async def _process_pulled_event( logger.warning("Pulled event %s failed history check.", event_id) else: raise - except (FederationError, RuntimeError, InvalidResponseError) as exc: - await self._store.record_event_failed_pull_attempt( - event.room_id, event_id, str(exc) - ) - raise exc @trace async def _compute_event_context_with_maybe_missing_prevs( From a238c94260101f67cbc3787b6fea50a3e52813d6 Mon Sep 17 00:00:00 2001 From: Eric Eastwood Date: Fri, 30 Sep 2022 20:44:04 -0500 Subject: [PATCH 3/3] Add changelog --- changelog.d/13969.misc | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/13969.misc diff --git a/changelog.d/13969.misc b/changelog.d/13969.misc new file mode 100644 index 000000000000..5ede0069c83f --- /dev/null +++ b/changelog.d/13969.misc @@ -0,0 +1 @@ +Revert catch-all exceptions being recorded as event pull attempt failures (only handle what we know about).