mirror of
https://git.anonymousland.org/anonymousland/synapse-product.git
synced 2024-09-08 19:32:07 +00:00
Upsert redactions in case they already exists (#10343)
* Upsert redactions in case they already exists Occasionally, in combination with retention, redactions aren't deleted from the database whenever they are due for deletion. The server will eventually try to backfill the deleted events and trip over the already existing redaction events. Switching to an UPSERT for those events allows us to recover from there situations. The retention code still needs fixing but that is outside of my current comfort zone on this code base. This is related to #8707 where the error was discussed already. Signed-off-by: Andreas Rammhold <andreas@rammhold.de> * Also purge redactions when purging events Previously redacints where left behind leading to backfilling issues when the server stumbled across the already existing yet to be backfilled redactions. This issues has been discussed in #8707. Signed-off-by: Andreas Rammhold <andreas@rammhold.de>
This commit is contained in:
parent
d26094e92c
commit
e3e73e181b
1
changelog.d/10343.bugfix
Normal file
1
changelog.d/10343.bugfix
Normal file
@ -0,0 +1 @@
|
|||||||
|
Fix errors during backfill caused by previously purged redaction events. Contributed by Andreas Rammhold (@andir).
|
@ -1580,11 +1580,11 @@ class PersistEventsStore:
|
|||||||
# invalidate the cache for the redacted event
|
# invalidate the cache for the redacted event
|
||||||
txn.call_after(self.store._invalidate_get_event_cache, event.redacts)
|
txn.call_after(self.store._invalidate_get_event_cache, event.redacts)
|
||||||
|
|
||||||
self.db_pool.simple_insert_txn(
|
self.db_pool.simple_upsert_txn(
|
||||||
txn,
|
txn,
|
||||||
table="redactions",
|
table="redactions",
|
||||||
|
keyvalues={"event_id": event.event_id},
|
||||||
values={
|
values={
|
||||||
"event_id": event.event_id,
|
|
||||||
"redacts": event.redacts,
|
"redacts": event.redacts,
|
||||||
"received_ts": self._clock.time_msec(),
|
"received_ts": self._clock.time_msec(),
|
||||||
},
|
},
|
||||||
|
@ -215,6 +215,7 @@ class PurgeEventsStore(StateGroupWorkerStore, CacheInvalidationWorkerStore):
|
|||||||
"event_relations",
|
"event_relations",
|
||||||
"event_search",
|
"event_search",
|
||||||
"rejections",
|
"rejections",
|
||||||
|
"redactions",
|
||||||
):
|
):
|
||||||
logger.info("[purge] removing events from %s", table)
|
logger.info("[purge] removing events from %s", table)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user