summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--changelog.d/13969.misc1
-rw-r--r--synapse/handlers/federation_event.py10
2 files changed, 1 insertions, 10 deletions
diff --git a/changelog.d/13969.misc b/changelog.d/13969.misc
new file mode 100644
index 0000000000..5ede0069c8
--- /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).
diff --git a/synapse/handlers/federation_event.py b/synapse/handlers/federation_event.py
index 3fac256881..778d8869b3 100644
--- a/synapse/handlers/federation_event.py
+++ b/synapse/handlers/federation_event.py
@@ -866,11 +866,6 @@ class FederationEventHandler:
                 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,11 +908,6 @@ class FederationEventHandler:
                 logger.warning("Pulled event %s failed history check.", event_id)
             else:
                 raise
-        except Exception 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(