Retry room directory lookups if they fail

This commit is contained in:
Neil Alexander 2021-03-19 14:31:37 +00:00
parent 9f2b61fb37
commit d960248ea8
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944

View file

@ -29,6 +29,8 @@ import (
pineconeSessions "github.com/matrix-org/pinecone/sessions" pineconeSessions "github.com/matrix-org/pinecone/sessions"
) )
const pineconeRoomAttempts = 3
type PineconeRoomProvider struct { type PineconeRoomProvider struct {
r *pineconeRouter.Router r *pineconeRouter.Router
s *pineconeSessions.Sessions s *pineconeSessions.Sessions
@ -84,12 +86,20 @@ func bulkFetchPublicRoomsFromServers(
go func(homeserverDomain gomatrixserverlib.ServerName) { go func(homeserverDomain gomatrixserverlib.ServerName) {
defer wg.Done() defer wg.Done()
util.GetLogger(ctx).WithField("hs", homeserverDomain).Info("Querying HS for public rooms") util.GetLogger(ctx).WithField("hs", homeserverDomain).Info("Querying HS for public rooms")
fres, err := fedClient.GetPublicRooms(ctx, homeserverDomain, int(limit), "", false, "") var fres gomatrixserverlib.RespPublicRooms
if err != nil { var err error
util.GetLogger(ctx).WithError(err).WithField("hs", homeserverDomain).Warn( for i := 0; i < pineconeRoomAttempts; i++ {
"bulkFetchPublicRoomsFromServers: failed to query hs", fres, err = fedClient.GetPublicRooms(ctx, homeserverDomain, int(limit), "", false, "")
) if err != nil {
return util.GetLogger(ctx).WithError(err).WithField("hs", homeserverDomain).Warn(
"bulkFetchPublicRoomsFromServers: failed to query hs",
)
if i == pineconeRoomAttempts-1 {
return
}
} else {
break
}
} }
for _, room := range fres.Chunk { for _, room := range fres.Chunk {
// atomically send a room or stop // atomically send a room or stop