Mirrors
/
synapse-old
mirror of https://github.com/matrix-org/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix exceptions from background database update for event labels. (#6407) 

Add some exception handling here so that events whose json cannot be parsed are
ignored rather than getting us stuck in a loop.

Fixes #6404.
This commit is contained in:
Richard van der Hoff 2019-11-25 13:26:59 +00:00 committed by GitHub
parent 41e4566682
commit b7367c339d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/6407.bugfix Normal file
View File

@ -0,0 +1 @@
Fix a bug which could cause the background database update hander for event labels to get stuck in a loop raising exceptions.

7
synapse/storage/data_stores/main/events_bg_updates.py
View File

@ -530,6 +530,7 @@ class EventsBackgroundUpdatesStore(BackgroundUpdateStore):
nbrows = 0 nbrows = 0
last_row_event_id = "" last_row_event_id = ""
for (event_id, event_json_raw) in results: for (event_id, event_json_raw) in results:
try:
event_json = json.loads(event_json_raw) event_json = json.loads(event_json_raw)
self._simple_insert_many_txn( self._simple_insert_many_txn(
@ -548,6 +549,12 @@ class EventsBackgroundUpdatesStore(BackgroundUpdateStore):
if isinstance(label, str) if isinstance(label, str)
], ],
) )
except Exception as e:
logger.warning(
"Unable to load event %s (no labels will be imported): %s",
event_id,
e,
)
nbrows += 1 nbrows += 1
last_row_event_id = event_id last_row_event_id = event_id