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

Increase AckWait to 5min to give federation requests more time

Browse source
This commit is contained in:
Till Faelligen 2023-12-18 08:58:41 +01:00
parent 8fe77e0d00
commit e067630887
No known key found for this signature in database
GPG key ID: 3DF82D8AB9211D4E
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
roomserver/internal/input/input.go
View file

@ -160,14 +160,16 @@ func (r *Inputer) startWorkerForRoom(roomID string) {
// The consumer already exists, try to update if necessary. // The consumer already exists, try to update if necessary.
if info != nil { if info != nil {
switch { switch {
case info.Config.AckWait.Nanoseconds() != consumerConfig.AckWait.Nanoseconds():
fallthrough
case info.Config.AckPolicy != consumerConfig.AckPolicy: case info.Config.AckPolicy != consumerConfig.AckPolicy:
logger.Warn("Consumer already exists, trying to update it.") logger.Warn("Consumer already exists, trying to update it.")
// Try updating the consumer first // Try updating the consumer first
if _, err = w.r.JetStream.UpdateConsumer(streamName, consumerConfig); err != nil { if _, err = w.r.JetStream.UpdateConsumer(streamName, consumerConfig); err != nil {
// We failed to update the consumer, recreate it // We failed to update the consumer, recreate it
logger.WithError(err).Warnf("Unable to update consumer %q, recreating...", consumer) logger.WithError(err).Warn("Unable to update consumer, recreating...")
if err = w.r.JetStream.DeleteConsumer(streamName, consumer); err != nil { if err = w.r.JetStream.DeleteConsumer(streamName, consumer); err != nil {
logger.WithError(err).Fatalf("Unable to delete consumer %q", consumer) logger.WithError(err).Fatal("Unable to delete consumer")
return return
} }
info = nil info = nil

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

@ -49,7 +49,7 @@ import (
) )
// TODO: Does this value make sense? // TODO: Does this value make sense?
const MaximumMissingProcessingTime = time.Minute * 2 const MaximumMissingProcessingTime = time.Minute * 5
var processRoomEventDuration = prometheus.NewHistogramVec( var processRoomEventDuration = prometheus.NewHistogramVec(
prometheus.HistogramOpts{ prometheus.HistogramOpts{