char
/
dendrite
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Return a non-fatal error to the federation API on a state regression (#1498) 

* Return a non-fatal error to the federation API on a state regression

* Return no error but don't morph state
main
Neil Alexander 2020-10-08 12:13:50 +01:00 committed by GitHub
parent 3e12f6e9c2
commit 429bd48129
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
roomserver/internal/input/input_latest_events.go
View File

@ -236,10 +236,13 @@ func (u *latestEventsUpdater) latestState() error {
if len(u.removed) > len(u.added) { if len(u.removed) > len(u.added) {
// This really shouldn't happen. // This really shouldn't happen.
// TODO: What is ultimately the best way to handle this situation? // TODO: What is ultimately the best way to handle this situation?
return fmt.Errorf( logrus.Errorf(
"invalid state delta wants to remove %d state but only add %d state (between state snapshots %d and %d)", "Invalid state delta on event %q wants to remove %d state but only add %d state (between state snapshots %d and %d)",
len(u.removed), len(u.added), u.oldStateNID, u.newStateNID, u.event.EventID(), len(u.removed), len(u.added), u.oldStateNID, u.newStateNID,
) )
u.added = u.added[:0]
u.removed = u.removed[:0]
return nil
} }
// Also work out the state before the event removes and the event // Also work out the state before the event removes and the event