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

Fix deadlocking Sync API tests

Browse source
This commit is contained in:
Neil Alexander 2020-08-18 09:33:43 +01:00
parent 2a9bb642ef
commit 150121d39a
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
3 changed files with 15 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
syncapi/storage/shared/syncserver.go
View file

@ -171,11 +171,7 @@ func (d *Database) SyncStreamPosition(ctx context.Context) (types.StreamPosition
func (d *Database) AddInviteEvent( func (d *Database) AddInviteEvent(
ctx context.Context, inviteEvent gomatrixserverlib.HeaderedEvent, ctx context.Context, inviteEvent gomatrixserverlib.HeaderedEvent,
) (sp types.StreamPosition, err error) { ) (sp types.StreamPosition, err error) {
err = sqlutil.WithTransaction(d.DB, func(txn *sql.Tx) error { return d.Invites.InsertInviteEvent(ctx, nil, inviteEvent)
sp, err = d.Invites.InsertInviteEvent(ctx, txn, inviteEvent)
return err
})
return
} }
// RetireInviteEvent removes an old invite event from the database. // RetireInviteEvent removes an old invite event from the database.

13
syncapi/storage/sqlite3/invites_table.go
View file

@ -95,13 +95,12 @@ func NewSqliteInvitesTable(db *sql.DB, writer sqlutil.TransactionWriter, streamI
func (s *inviteEventsStatements) InsertInviteEvent( func (s *inviteEventsStatements) InsertInviteEvent(
ctx context.Context, txn *sql.Tx, inviteEvent gomatrixserverlib.HeaderedEvent, ctx context.Context, txn *sql.Tx, inviteEvent gomatrixserverlib.HeaderedEvent,
) (streamPos types.StreamPosition, err error) { ) (streamPos types.StreamPosition, err error) {
err = s.writer.Do(s.db, txn, func(txn *sql.Tx) error {
var err error
streamPos, err = s.streamIDStatements.nextStreamID(ctx, txn) streamPos, err = s.streamIDStatements.nextStreamID(ctx, txn)
if err != nil { if err != nil {
return err return
} }
err = s.writer.Do(s.db, txn, func(txn *sql.Tx) error {
var headeredJSON []byte var headeredJSON []byte
headeredJSON, err = json.Marshal(inviteEvent) headeredJSON, err = json.Marshal(inviteEvent)
if err != nil { if err != nil {
@ -124,13 +123,11 @@ func (s *inviteEventsStatements) InsertInviteEvent(
func (s *inviteEventsStatements) DeleteInviteEvent( func (s *inviteEventsStatements) DeleteInviteEvent(
ctx context.Context, inviteEventID string, ctx context.Context, inviteEventID string,
) (types.StreamPosition, error) { ) (types.StreamPosition, error) {
var streamPos types.StreamPosition streamPos, err := s.streamIDStatements.nextStreamID(ctx, nil)
err := s.writer.Do(s.db, nil, func(txn *sql.Tx) error {
var err error
streamPos, err = s.streamIDStatements.nextStreamID(ctx, nil)
if err != nil { if err != nil {
return err return streamPos, err
} }
err = s.writer.Do(s.db, nil, func(txn *sql.Tx) error {
_, err = s.deleteInviteEventStmt.ExecContext(ctx, streamPos, inviteEventID) _, err = s.deleteInviteEventStmt.ExecContext(ctx, streamPos, inviteEventID)
return err return err
}) })

8
syncapi/storage/sqlite3/output_room_events_table.go
View file

@ -304,13 +304,11 @@ func (s *outputRoomEventsStatements) InsertEvent(
return 0, err return 0, err
} }
var streamPos types.StreamPosition streamPos, err := s.streamIDStatements.nextStreamID(ctx, txn)
err = s.writer.Do(s.db, txn, func(txn *sql.Tx) error {
streamPos, err = s.streamIDStatements.nextStreamID(ctx, txn)
if err != nil { if err != nil {
return err return 0, err
} }
err = s.writer.Do(s.db, txn, func(txn *sql.Tx) error {
insertStmt := sqlutil.TxStmt(txn, s.insertEventStmt) insertStmt := sqlutil.TxStmt(txn, s.insertEventStmt)
_, ierr := insertStmt.ExecContext( _, ierr := insertStmt.ExecContext(
ctx, ctx,