tileradotorg/synapse
1
0
Fork 0
forked from MirrorHub/synapse
Code Pull requests Activity

In _purge_history_txn, ensure that txn.fetchall has elements before accessing rows (#10690)

Browse source 
This change adds a check for row existence before accessing row element, this should fix issue #10669
Signed-off-by: Vasya Boytsov vasiliy.boytsov@phystech.edu
This commit is contained in:
Kokokokoka 2021-09-24 12:19:51 +03:00 committed by GitHub
parent 90d9fc7505
commit e704cc2a48
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog.d/10690.bugfix Normal file
View file

@ -0,0 +1 @@
Fix a long-standing bug that caused an `AssertionError` when purging history in certain rooms. Contributed by @Kokokokoka.

6
synapse/storage/databases/main/purge_events.py
View file

@ -102,6 +102,10 @@ class PurgeEventsStore(StateGroupWorkerStore, CacheInvalidationWorkerStore):
(room_id,), (room_id,),
) )
rows = txn.fetchall() rows = txn.fetchall()
# if we already have no forwards extremities (for example because they were
# cleared out by the `delete_old_current_state_events` background database
# update), then we may as well carry on.
if rows:
max_depth = max(row[1] for row in rows) max_depth = max(row[1] for row in rows)
if max_depth < token.topological: if max_depth < token.topological:
@ -109,7 +113,7 @@ class PurgeEventsStore(StateGroupWorkerStore, CacheInvalidationWorkerStore):
# otherwise we wouldn't be able to send any events (due to not # otherwise we wouldn't be able to send any events (due to not
# having any backwards extremities) # having any backwards extremities)
raise SynapseError( raise SynapseError(
400, "topological_ordering is greater than forward extremeties" 400, "topological_ordering is greater than forward extremities"
) )
logger.info("[purge] looking for events to delete") logger.info("[purge] looking for events to delete")