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

Ask more servers in lookupEvent

Browse source
This commit is contained in:
Neil Alexander 2020-10-12 16:32:04 +01:00
parent 474faccf51
commit bd7d1ccdfa
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
1 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
federationapi/routing/send.go
View file

@ -573,7 +573,7 @@ func (t *txnReq) lookupStateAfterEvent(ctx context.Context, roomVersion gomatrix
respState, err := t.lookupStateBeforeEvent(ctx, roomVersion, roomID, eventID) respState, err := t.lookupStateBeforeEvent(ctx, roomVersion, roomID, eventID)
if err != nil { if err != nil {
return nil, err return nil, fmt.Errorf("t.lookupStateBeforeEvent: %w", err)
} }
// fetch the event we're missing and add it to the pile // fetch the event we're missing and add it to the pile
@ -584,7 +584,7 @@ func (t *txnReq) lookupStateAfterEvent(ctx context.Context, roomVersion gomatrix
case nil: case nil:
// do nothing // do nothing
default: default:
return nil, err return nil, fmt.Errorf("t.lookupEvent: %w", err)
} }
t.haveEvents[h.EventID()] = h t.haveEvents[h.EventID()] = h
if h.StateKey() != nil { if h.StateKey() != nil {
@ -993,14 +993,20 @@ func (t *txnReq) lookupEvent(ctx context.Context, roomVersion gomatrixserverlib.
return &queryRes.Events[0], nil return &queryRes.Events[0], nil
} }
} }
txn, err := t.federation.GetEvent(ctx, t.Origin, missingEventID) var pdu json.RawMessage
if err != nil || len(txn.PDUs) == 0 { for _, serverName := range t.servers {
util.GetLogger(ctx).WithError(err).WithField("event_id", missingEventID).Warn("failed to get missing /event for event ID") txn, err := t.federation.GetEvent(ctx, serverName, missingEventID)
return nil, err if err != nil || len(txn.PDUs) == 0 {
util.GetLogger(ctx).WithError(err).WithField("event_id", missingEventID).Warn("Failed to get missing /event for event ID")
continue
}
pdu = txn.PDUs[0]
break
} }
pdu := txn.PDUs[0] if len(pdu) == 0 {
var event gomatrixserverlib.Event util.GetLogger(ctx).WithField("event_id", missingEventID).Warnf("Failed to get missing /event for event ID from %d server(s)", len(t.servers))
event, err = gomatrixserverlib.NewEventFromUntrustedJSON(pdu, roomVersion) }
event, err := gomatrixserverlib.NewEventFromUntrustedJSON(pdu, roomVersion)
if err != nil { if err != nil {
util.GetLogger(ctx).WithError(err).Warnf("Transaction: Failed to parse event JSON of event %q", event.EventID()) util.GetLogger(ctx).WithError(err).Warnf("Transaction: Failed to parse event JSON of event %q", event.EventID())
return nil, unmarshalError{err} return nil, unmarshalError{err}