sigb.us/dendrite
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases 1 Wiki Activity

Track missing prev events separately to avoid calculating state when not possible

Browse source
This commit is contained in:
Neil Alexander 2022-01-20 17:42:45 +00:00
parent b143d7bc88
commit 848f5487f0
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
roomserver/internal/input/input_events.go
View file

@ -166,6 +166,7 @@ func (r *Inputer) processRoomEvent(
} }
} }
missingPrev := false
if input.Kind != api.KindOutlier && len(missingRes.MissingPrevEventIDs) > 0 { if input.Kind != api.KindOutlier && len(missingRes.MissingPrevEventIDs) > 0 {
if len(serverRes.ServerNames) > 0 { if len(serverRes.ServerNames) > 0 {
missingState := missingStateReq{ missingState := missingStateReq{
@ -182,10 +183,12 @@ func (r *Inputer) processRoomEvent(
} }
if err = missingState.processEventWithMissingState(ctx, input.Event.Unwrap(), input.Event.RoomVersion); err != nil { if err = missingState.processEventWithMissingState(ctx, input.Event.Unwrap(), input.Event.RoomVersion); err != nil {
isRejected = true isRejected = true
missingPrev = true
rejectionErr = fmt.Errorf("missingState.processEventWithMissingState: %w", err) rejectionErr = fmt.Errorf("missingState.processEventWithMissingState: %w", err)
} }
} else { } else {
isRejected = true isRejected = true
missingPrev = true
rejectionErr = fmt.Errorf("missing prev events and no other servers to ask") rejectionErr = fmt.Errorf("missing prev events and no other servers to ask")
} }
} }
@ -221,7 +224,7 @@ func (r *Inputer) processRoomEvent(
return fmt.Errorf("r.DB.RoomInfo missing for room %s", event.RoomID()) return fmt.Errorf("r.DB.RoomInfo missing for room %s", event.RoomID())
} }
if stateAtEvent.BeforeStateSnapshotNID == 0 { if !missingPrev && stateAtEvent.BeforeStateSnapshotNID == 0 {
// We haven't calculated a state for this event yet. // We haven't calculated a state for this event yet.
// Lets calculate one. // Lets calculate one.
err = r.calculateAndSetState(ctx, input, roomInfo, &stateAtEvent, event, isRejected) err = r.calculateAndSetState(ctx, input, roomInfo, &stateAtEvent, event, isRejected)