hoernschen/dendrite
1
0
Fork 0
mirror of https://github.com/hoernschen/dendrite.git synced 2025-08-02 06:12:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Transaction writer changes, move roomserver writers (#1285)

Browse source 
* Updated TransactionWriters, moved locks in roomserver, various other tweaks

* Fix redaction deadlocks

* Fix lint issue

* Rename SQLiteTransactionWriter to ExclusiveTransactionWriter

* Fix us not sending transactions through in latest events updater
This commit is contained in:
Neil Alexander 2020-08-19 15:38:27 +01:00 • committed by GitHub
parent 775b04d776
commit b24747b305
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
54 changed files with 432 additions and 434 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -27,6 +27,7 @@ const redactionsArePermanent = false
type Database struct {
DB *sql.DB
Writer sqlutil.TransactionWriter
EventsTable tables.Events
EventJSONTable tables.EventJSON
EventTypesTable tables.EventTypes
@ -83,20 +84,23 @@ func (d *Database) AddState(
stateBlockNIDs []types.StateBlockNID,
state []types.StateEntry,
) (stateNID types.StateSnapshotNID, err error) {
err = sqlutil.WithTransaction(d.DB, func(txn *sql.Tx) error {
err = d.Writer.Do(d.DB, nil, func(txn *sql.Tx) error {
if len(state) > 0 {
var stateBlockNID types.StateBlockNID
stateBlockNID, err = d.StateBlockTable.BulkInsertStateData(ctx, txn, state)
if err != nil {
return err
return fmt.Errorf("d.StateBlockTable.BulkInsertStateData: %w", err)
}
stateBlockNIDs = append(stateBlockNIDs[:len(stateBlockNIDs):len(stateBlockNIDs)], stateBlockNID)
}
stateNID, err = d.StateSnapshotTable.InsertState(ctx, txn, roomNID, stateBlockNIDs)
return err
if err != nil {
return fmt.Errorf("d.StateSnapshotTable.InsertState: %w", err)
}
return nil
})
if err != nil {
return 0, err
return 0, fmt.Errorf("d.Writer.Do: %w", err)
}
return
}
@ -110,7 +114,9 @@ func (d *Database) EventNIDs(
func (d *Database) SetState(
ctx context.Context, eventNID types.EventNID, stateNID types.StateSnapshotNID,
) error {
return d.EventsTable.UpdateEventState(ctx, eventNID, stateNID)
return d.Writer.Do(d.DB, nil, func(_ *sql.Tx) error {
return d.EventsTable.UpdateEventState(ctx, eventNID, stateNID)
})
}
func (d *Database) StateAtEventIDs(
@ -221,7 +227,9 @@ func (d *Database) GetRoomVersionForRoomNID(
}
func (d *Database) SetRoomAlias(ctx context.Context, alias string, roomID string, creatorUserID string) error {
return d.RoomAliasesTable.InsertRoomAlias(ctx, alias, roomID, creatorUserID)
return d.Writer.Do(d.DB, nil, func(_ *sql.Tx) error {
return d.RoomAliasesTable.InsertRoomAlias(ctx, alias, roomID, creatorUserID)
})
}
func (d *Database) GetRoomIDForAlias(ctx context.Context, alias string) (string, error) {
@ -239,15 +247,21 @@ func (d *Database) GetCreatorIDForAlias(
}
func (d *Database) RemoveRoomAlias(ctx context.Context, alias string) error {
return d.RoomAliasesTable.DeleteRoomAlias(ctx, alias)
return d.Writer.Do(d.DB, nil, func(_ *sql.Tx) error {
return d.RoomAliasesTable.DeleteRoomAlias(ctx, alias)
})
}
func (d *Database) GetMembership(
ctx context.Context, roomNID types.RoomNID, requestSenderUserID string,
) (membershipEventNID types.EventNID, stillInRoom bool, err error) {
requestSenderUserNID, err := d.assignStateKeyNID(ctx, nil, requestSenderUserID)
var requestSenderUserNID types.EventStateKeyNID
err = d.Writer.Do(d.DB, nil, func(_ *sql.Tx) error {
requestSenderUserNID, err = d.assignStateKeyNID(ctx, nil, requestSenderUserID)
return err
})
if err != nil {
return
return 0, false, fmt.Errorf("d.assignStateKeyNID: %w", err)
}
senderMembershipEventNID, senderMembership, err :=
@ -350,6 +364,7 @@ func (d *Database) GetLatestEventsForUpdate(
return NewLatestEventsUpdater(ctx, d, txn, roomNID)
}
// nolint:gocyclo
func (d *Database) StoreEvent(
ctx context.Context, event gomatrixserverlib.Event,
txnAndSessionID *api.TransactionID, authEventNIDs []types.EventNID,
@ -365,10 +380,10 @@ func (d *Database) StoreEvent(
err error
)
err = sqlutil.WithTransaction(d.DB, func(txn *sql.Tx) error {
err = d.Writer.Do(d.DB, nil, func(txn *sql.Tx) error {
if txnAndSessionID != nil {
if err = d.TransactionsTable.InsertTransaction(
ctx, txn, txnAndSessionID.TransactionID,
ctx, nil, txnAndSessionID.TransactionID,
txnAndSessionID.SessionID, event.Sender(), event.EventID(),
); err != nil {
return fmt.Errorf("d.TransactionsTable.InsertTransaction: %w", err)
@ -433,7 +448,7 @@ func (d *Database) StoreEvent(
return nil
})
if err != nil {
return 0, types.StateAtEvent{}, nil, "", err
return 0, types.StateAtEvent{}, nil, "", fmt.Errorf("d.Writer.Do: %w", err)
}
return roomNID, types.StateAtEvent{
@ -449,7 +464,9 @@ func (d *Database) StoreEvent(
}
func (d *Database) PublishRoom(ctx context.Context, roomID string, publish bool) error {
return d.PublishedTable.UpsertRoomPublished(ctx, roomID, publish)
return d.Writer.Do(d.DB, nil, func(_ *sql.Tx) error {
return d.PublishedTable.UpsertRoomPublished(ctx, roomID, publish)
})
}
func (d *Database) GetPublishedRooms(ctx context.Context) ([]string, error) {