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

purge: move room_depth update to end

Browse source 
... to avoid locking the table for too long
This commit is contained in:
Richard van der Hoff 2018-02-09 12:13:34 +00:00
parent 74fcbf741b
commit 39a6b35496
1 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
synapse/storage/events.py
View file

@ -2255,12 +2255,6 @@ class EventsStore(SQLBaseStore):
event_id, event_id,
)) ))
logger.info("[purge] updating room_depth")
txn.execute(
"UPDATE room_depth SET min_depth = ? WHERE room_id = ?",
(topological_ordering, room_id,)
)
# Delete all remote non-state events # Delete all remote non-state events
for table in ( for table in (
"events", "events",
@ -2298,6 +2292,18 @@ class EventsStore(SQLBaseStore):
] ]
) )
# synapse tries to take out an exclusive lock on room_depth whenever it
# persists events (because upsert), and once we run this update, we
# will block that for the rest of our transaction.
#
# So, let's stick it at the end so that we don't block event
# persistence.
logger.info("[purge] updating room_depth")
txn.execute(
"UPDATE room_depth SET min_depth = ? WHERE room_id = ?",
(topological_ordering, room_id,)
)
logger.info("[purge] done") logger.info("[purge] done")
@defer.inlineCallbacks @defer.inlineCallbacks