Browse Source

Revert the general exception recording introduced in #13814 (#13969)

* Maybe not catch all errors to avoid things in the nature-of CancelledError

See https://github.com/matrix-org/synapse/pull/13815#discussion_r983384698

* Remove general exception tracking

* Add changelog
tags/v1.69.0rc1
Eric Eastwood 1 year ago
committed by GitHub
parent
commit
2769ef4df1
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 10 deletions
  1. +1
    -0
      changelog.d/13969.misc
  2. +0
    -10
      synapse/handlers/federation_event.py

+ 1
- 0
changelog.d/13969.misc View File

@@ -0,0 +1 @@
Revert catch-all exceptions being recorded as event pull attempt failures (only handle what we know about).

+ 0
- 10
synapse/handlers/federation_event.py View File

@@ -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(


Loading…
Cancel
Save