Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Matrix
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Container Registry
Model registry
Operate
Environments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
TeDomum
Matrix
Commits
8b6ff1db
Commit
8b6ff1db
authored
7 months ago
by
Erik Johnston
Browse files
Options
Downloads
Patches
Plain Diff
Revert "Also handle invalid event errors"
This reverts commit
b4d0356e
.
parent
b4d0356e
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
synapse/storage/databases/main/events_bg_updates.py
+3
-6
3 additions, 6 deletions
synapse/storage/databases/main/events_bg_updates.py
with
3 additions
and
6 deletions
synapse/storage/databases/main/events_bg_updates.py
+
3
−
6
View file @
8b6ff1db
...
...
@@ -41,10 +41,7 @@ from synapse.storage.databases.main.events import (
SlidingSyncMembershipSnapshotSharedInsertValues
,
SlidingSyncStateInsertValues
,
)
from
synapse.storage.databases.main.events_worker
import
(
DatabaseCorruptionError
,
InvalidEventError
,
)
from
synapse.storage.databases.main.events_worker
import
DatabaseCorruptionError
from
synapse.storage.databases.main.state_deltas
import
StateDeltasStore
from
synapse.storage.databases.main.stream
import
StreamWorkerStore
from
synapse.storage.types
import
Cursor
...
...
@@ -2093,7 +2090,7 @@ class EventsBackgroundUpdatesStore(StreamWorkerStore, StateDeltasStore, SQLBaseS
fetched_events
=
await
self
.
get_events
(
current_state_ids_map
.
values
()
)
except
(
DatabaseCorruptionError
,
InvalidEventError
)
as
e
:
except
DatabaseCorruptionError
as
e
:
logger
.
warning
(
"
Failed to fetch state for room
'
%s
'
due to corrupted events. Ignoring. Error: %s
"
,
room_id
,
...
...
@@ -2200,7 +2197,7 @@ class EventsBackgroundUpdatesStore(StreamWorkerStore, StateDeltasStore, SQLBaseS
try
:
fetched_events
=
await
self
.
get_events
(
state_ids_map
.
values
())
except
(
DatabaseCorruptionError
,
InvalidEventError
)
as
e
:
except
DatabaseCorruptionError
as
e
:
logger
.
warning
(
"
Failed to fetch state for room
'
%s
'
due to corrupted events. Ignoring. Error: %s
"
,
room_id
,
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment