mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-12-21 13:53:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix redaction deadlocks

Browse source
This commit is contained in:
Neil Alexander 2020-08-18 17:26:59 +01:00
parent 630d6bd9c5
commit ef02d503bc
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
1 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
roomserver/storage/shared/storage.go
View file

@ -571,12 +571,10 @@ func (d *Database) handleRedactions(
return nil, "", nil return nil, "", nil
} }
err = d.Writer.Do(d.DB, txn, func(txn *sql.Tx) error { err = d.RedactionsTable.InsertRedaction(ctx, txn, tables.RedactionInfo{
return d.RedactionsTable.InsertRedaction(ctx, txn, tables.RedactionInfo{ Validated: false,
Validated: false, RedactionEventID: event.EventID(),
RedactionEventID: event.EventID(), RedactsEventID: event.Redacts(),
RedactsEventID: event.Redacts(),
})
}) })
if err != nil { if err != nil {
return nil, "", err return nil, "", err
@ -605,9 +603,7 @@ func (d *Database) handleRedactions(
redactedEvent.Event = redactedEvent.Redact() redactedEvent.Event = redactedEvent.Redact()
} }
// overwrite the eventJSON table // overwrite the eventJSON table
err = d.Writer.Do(d.DB, txn, func(txn *sql.Tx) error { err = d.EventJSONTable.InsertEventJSON(ctx, txn, redactedEvent.EventNID, redactedEvent.JSON())
return d.EventJSONTable.InsertEventJSON(ctx, txn, redactedEvent.EventNID, redactedEvent.JSON())
})
if err != nil { if err != nil {
return nil, "", err return nil, "", err
} }