Try to slow things down per room

This commit is contained in:
Neil Alexander 2021-06-28 13:50:18 +01:00
parent b97d406dff
commit 6e6f026cfa
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944

View file

@ -620,13 +620,18 @@ func checkAllowedByState(e *gomatrixserverlib.Event, stateEvents []*gomatrixserv
return gomatrixserverlib.Allowed(e, &authUsingState) return gomatrixserverlib.Allowed(e, &authUsingState)
} }
var processEventWithMissingStateMutex sync.Mutex var processEventWithMissingStateMutexes = map[string]*sync.Mutex{}
func (t *txnReq) processEventWithMissingState( func (t *txnReq) processEventWithMissingState(
ctx context.Context, e *gomatrixserverlib.Event, roomVersion gomatrixserverlib.RoomVersion, ctx context.Context, e *gomatrixserverlib.Event, roomVersion gomatrixserverlib.RoomVersion,
) error { ) error {
processEventWithMissingStateMutex.Lock() mu, ok := processEventWithMissingStateMutexes[e.RoomID()]
defer processEventWithMissingStateMutex.Unlock() if !ok {
processEventWithMissingStateMutexes[e.RoomID()] = &sync.Mutex{}
mu = processEventWithMissingStateMutexes[e.RoomID()]
}
mu.Lock()
defer mu.Unlock()
// Do this with a fresh context, so that we keep working even if the // Do this with a fresh context, so that we keep working even if the
// original request times out. With any luck, by the time the remote // original request times out. With any luck, by the time the remote