Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Revert the general exception recording for event failed pull attempts introduced in #13814 #13969

Merged
merged 3 commits into from
Oct 3, 2022
Merged

Revert the general exception recording for event failed pull attempts introduced in #13814 #13969

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fd38996
Maybe not catch all errors to avoid things in the nature-of Cancelled…
MadLittleMods Sep 30, 2022
2d62a81
Remove general exception tracking
MadLittleMods Oct 1, 2022
a238c94
Add changelog
MadLittleMods Oct 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/13969.misc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Revert catch-all exceptions being recorded as event pull attempt failures (only handle what we know about).
10 changes: 0 additions & 10 deletions synapse/handlers/federation_event.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -913,11 +908,6 @@ async def _process_pulled_event(
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(
Expand Down