WIP test to avoid roomserver deadlocks

roomserver/storage/interface.go

@@ -16,6 +16,7 @@ package storage
 
 import (
 	"context"
+	"database/sql"
 
 	"github.com/matrix-org/dendrite/roomserver/api"
 	"github.com/matrix-org/dendrite/roomserver/storage/shared"
@@ -32,6 +33,7 @@ type Database interface {
 	// Store the room state at an event in the database
 	AddState(
 		ctx context.Context,
+		txn *sql.Tx,
 		roomNID types.RoomNID,
 		stateBlockNIDs []types.StateBlockNID,
 		state []types.StateEntry,

roomserver/storage/shared/latest_events_updater.go

@@ -16,6 +16,7 @@ type LatestEventsUpdater struct {
 	latestEvents            []types.StateAtEventAndReference
 	lastEventIDSent         string
 	currentStateSnapshotNID types.StateSnapshotNID
+	Txn                     *sql.Tx
 }
 
 func rollback(txn *sql.Tx) {
@@ -46,7 +47,7 @@ func NewLatestEventsUpdater(ctx context.Context, d *Database, txn *sql.Tx, roomI
 		}
 	}
 	return &LatestEventsUpdater{
-		transaction{ctx, txn}, d, roomInfo, stateAndRefs, lastEventIDSent, currentStateSnapshotNID,
+		transaction{ctx, txn}, d, roomInfo, stateAndRefs, lastEventIDSent, currentStateSnapshotNID, txn,
 	}, nil
 }
 

roomserver/storage/shared/storage.go

@@ -137,11 +137,12 @@ func (d *Database) RoomInfo(ctx context.Context, roomID string) (*types.RoomInfo
 
 func (d *Database) AddState(
 	ctx context.Context,
+	txn *sql.Tx,
 	roomNID types.RoomNID,
 	stateBlockNIDs []types.StateBlockNID,
 	state []types.StateEntry,
 ) (stateNID types.StateSnapshotNID, err error) {
-	err = d.Writer.Do(d.DB, nil, func(txn *sql.Tx) error {
+	err = d.Writer.Do(d.DB, txn, func(txn *sql.Tx) error {
 		if len(state) > 0 {
 			var stateBlockNID types.StateBlockNID
 			stateBlockNID, err = d.StateBlockTable.BulkInsertStateData(ctx, txn, state)