mirror of
https://github.com/1f349/dendrite.git
synced 2024-11-22 11:41:38 +00:00
Return ErrRoomNoExists
if insufficient state is available for a buildEvent
to succeed when joining a room (#2210)
This may help cases like #2206, since it should prompt us to try a federated join again instead.
This commit is contained in:
parent
cf525d1f61
commit
aa6bbf484a
@ -29,6 +29,7 @@ import (
|
|||||||
"github.com/matrix-org/dendrite/roomserver/internal/input"
|
"github.com/matrix-org/dendrite/roomserver/internal/input"
|
||||||
"github.com/matrix-org/dendrite/roomserver/internal/query"
|
"github.com/matrix-org/dendrite/roomserver/internal/query"
|
||||||
"github.com/matrix-org/dendrite/roomserver/storage"
|
"github.com/matrix-org/dendrite/roomserver/storage"
|
||||||
|
"github.com/matrix-org/dendrite/roomserver/types"
|
||||||
"github.com/matrix-org/dendrite/setup/config"
|
"github.com/matrix-org/dendrite/setup/config"
|
||||||
"github.com/matrix-org/gomatrixserverlib"
|
"github.com/matrix-org/gomatrixserverlib"
|
||||||
"github.com/sirupsen/logrus"
|
"github.com/sirupsen/logrus"
|
||||||
@ -367,7 +368,15 @@ func buildEvent(
|
|||||||
StateToFetch: eventsNeeded.Tuples(),
|
StateToFetch: eventsNeeded.Tuples(),
|
||||||
}, &queryRes)
|
}, &queryRes)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, nil, fmt.Errorf("QueryLatestEventsAndState: %w", err)
|
switch err.(type) {
|
||||||
|
case types.MissingStateError:
|
||||||
|
// We know something about the room but the state seems to be
|
||||||
|
// insufficient to actually build a new event, so in effect we
|
||||||
|
// had might as well treat the room as if it doesn't exist.
|
||||||
|
return nil, nil, eventutil.ErrRoomNoExists
|
||||||
|
default:
|
||||||
|
return nil, nil, fmt.Errorf("QueryLatestEventsAndState: %w", err)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
ev, err := eventutil.BuildEvent(ctx, builder, cfg, time.Now(), &eventsNeeded, &queryRes)
|
ev, err := eventutil.BuildEvent(ctx, builder, cfg, time.Now(), &eventsNeeded, &queryRes)
|
||||||
|
@ -134,7 +134,7 @@ func (s *stateSnapshotStatements) BulkSelectStateBlockNIDs(
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
if i != len(stateNIDs) {
|
if i != len(stateNIDs) {
|
||||||
return nil, fmt.Errorf("storage: state NIDs missing from the database (%d != %d)", i, len(stateNIDs))
|
return nil, types.MissingStateError(fmt.Sprintf("storage: state NIDs missing from the database (%d != %d)", i, len(stateNIDs)))
|
||||||
}
|
}
|
||||||
return results, nil
|
return results, nil
|
||||||
}
|
}
|
||||||
|
@ -137,7 +137,7 @@ func (s *stateSnapshotStatements) BulkSelectStateBlockNIDs(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
if i != len(stateNIDs) {
|
if i != len(stateNIDs) {
|
||||||
return nil, fmt.Errorf("storage: state NIDs missing from the database (%d != %d)", i, len(stateNIDs))
|
return nil, types.MissingStateError(fmt.Sprintf("storage: state NIDs missing from the database (%d != %d)", i, len(stateNIDs)))
|
||||||
}
|
}
|
||||||
return results, nil
|
return results, nil
|
||||||
}
|
}
|
||||||
|
@ -213,6 +213,12 @@ type MissingEventError string
|
|||||||
|
|
||||||
func (e MissingEventError) Error() string { return string(e) }
|
func (e MissingEventError) Error() string { return string(e) }
|
||||||
|
|
||||||
|
// A MissingStateError is an error that happened because the roomserver was
|
||||||
|
// missing requested state snapshots from its databases.
|
||||||
|
type MissingStateError string
|
||||||
|
|
||||||
|
func (e MissingStateError) Error() string { return string(e) }
|
||||||
|
|
||||||
// A RejectedError is returned when an event is stored as rejected. The error
|
// A RejectedError is returned when an event is stored as rejected. The error
|
||||||
// contains the reason why.
|
// contains the reason why.
|
||||||
type RejectedError string
|
type RejectedError string
|
||||||
|
Loading…
Reference in New Issue
Block a user