mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2024-11-26 08:11:55 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix more roomserver transactions/locks (#1287)

Browse source 
* Fix transaction to InsertTransaction

* Remove unnecessary txn, add txns around setting up updaters
This commit is contained in:
Neil Alexander 2020-08-20 09:24:52 +01:00 committed by GitHub
parent f5edfb9659
commit 5ad47d3b3d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 26 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -179,22 +179,19 @@ func (d *Database) RoomNIDExcludingStubs(ctx context.Context, roomID string) (ro
func (d *Database) LatestEventIDs( func (d *Database) LatestEventIDs(
ctx context.Context, roomNID types.RoomNID, ctx context.Context, roomNID types.RoomNID,
) (references []gomatrixserverlib.EventReference, currentStateSnapshotNID types.StateSnapshotNID, depth int64, err error) { ) (references []gomatrixserverlib.EventReference, currentStateSnapshotNID types.StateSnapshotNID, depth int64, err error) {
err = sqlutil.WithTransaction(d.DB, func(txn *sql.Tx) error { var eventNIDs []types.EventNID
var eventNIDs []types.EventNID eventNIDs, currentStateSnapshotNID, err = d.RoomsTable.SelectLatestEventNIDs(ctx, nil, roomNID)
eventNIDs, currentStateSnapshotNID, err = d.RoomsTable.SelectLatestEventNIDs(ctx, txn, roomNID) if err != nil {
if err != nil { return
return err }
} references, err = d.EventsTable.BulkSelectEventReference(ctx, nil, eventNIDs)
references, err = d.EventsTable.BulkSelectEventReference(ctx, txn, eventNIDs) if err != nil {
if err != nil { return
return err }
} depth, err = d.EventsTable.SelectMaxEventDepth(ctx, nil, eventNIDs)
depth, err = d.EventsTable.SelectMaxEventDepth(ctx, txn, eventNIDs) if err != nil {
if err != nil { return
return err }
}
return nil
})
return return
} }
@ -351,7 +348,12 @@ func (d *Database) MembershipUpdater(
if err != nil { if err != nil {
return nil, err return nil, err
} }
return NewMembershipUpdater(ctx, d, txn, roomID, targetUserID, targetLocal, roomVersion) var updater *MembershipUpdater
_ = d.Writer.Do(d.DB, txn, func(txn *sql.Tx) error {
updater, err = NewMembershipUpdater(ctx, d, txn, roomID, targetUserID, targetLocal, roomVersion)
return nil
})
return updater, err
} }
func (d *Database) GetLatestEventsForUpdate( func (d *Database) GetLatestEventsForUpdate(
@ -361,7 +363,12 @@ func (d *Database) GetLatestEventsForUpdate(
if err != nil { if err != nil {
return nil, err return nil, err
} }
return NewLatestEventsUpdater(ctx, d, txn, roomNID) var updater *LatestEventsUpdater
_ = d.Writer.Do(d.DB, txn, func(txn *sql.Tx) error {
updater, err = NewLatestEventsUpdater(ctx, d, txn, roomNID)
return nil
})
return updater, err
} }
// nolint:gocyclo // nolint:gocyclo
@ -383,7 +390,7 @@ func (d *Database) StoreEvent(
err = d.Writer.Do(d.DB, nil, func(txn *sql.Tx) error { err = d.Writer.Do(d.DB, nil, func(txn *sql.Tx) error {
if txnAndSessionID != nil { if txnAndSessionID != nil {
if err = d.TransactionsTable.InsertTransaction( if err = d.TransactionsTable.InsertTransaction(
ctx, nil, txnAndSessionID.TransactionID, ctx, txn, txnAndSessionID.TransactionID,
txnAndSessionID.SessionID, event.Sender(), event.EventID(), txnAndSessionID.SessionID, event.Sender(), event.EventID(),
); err != nil { ); err != nil {
return fmt.Errorf("d.TransactionsTable.InsertTransaction: %w", err) return fmt.Errorf("d.TransactionsTable.InsertTransaction: %w", err)