tileradotorg/mautrix-whatsapp
1
0
Fork 0
forked from MirrorHub/mautrix-whatsapp
Code Pull requests Activity

backfill loops: combine immediate and deferred loops

Browse source
This commit is contained in:
Sumner Evans 2022-04-28 15:37:51 -06:00
parent ac7a437ad8
commit d898aefff1
No known key found for this signature in database
GPG key ID: 8904527AB50022FD
2 changed files with 6 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
backfillqueue.go
View file

@ -32,33 +32,13 @@ type BackfillQueue struct {
log log.Logger
}
func (bq *BackfillQueue) RunLoops(user *User) {
go bq.immediateBackfillLoop(user)
bq.deferredBackfillLoop(user)
}
func (bq *BackfillQueue) immediateBackfillLoop(user *User) {
// Immediate backfills should happen first, then deferred backfills and lastly
// media backfills.
func (bq *BackfillQueue) RunLoop(user *User) {
for {
if backfill := bq.BackfillQuery.GetNext(user.MXID, database.BackfillImmediate); backfill != nil {
bq.ImmediateBackfillRequests <- backfill
backfill.MarkDone()
} else {
select {
case <-bq.ReCheckQueue:
bq.log.Debugfln("Re-checking infinite backfill queue due to forced re-check")
case <-time.After(10 * time.Second):
bq.log.Debugfln("Re-checking infinite backfill queue due to timeout")
}
}
}
}
func (bq *BackfillQueue) deferredBackfillLoop(user *User) {
for {
// Finish all immediate backfills before doing the deferred ones.
if immediate := bq.BackfillQuery.GetNext(user.MXID, database.BackfillImmediate); immediate != nil {
bq.log.Debugfln("Not doing any deferred or media backfill since there are immediate backfills to do")
time.Sleep(10 * time.Second)
bq.ImmediateBackfillRequests <- immediate
immediate.MarkDone()
} else if backfill := bq.BackfillQuery.GetNext(user.MXID, database.BackfillDeferred); backfill != nil {
bq.DeferredBackfillRequests <- backfill
backfill.MarkDone()

2
historysync.go
View file

@ -67,7 +67,7 @@ func (user *User) handleHistorySyncsLoop() {
// overload the homeserver. Users can configure their backfill stages
// to be more or less aggressive with backfilling at this stage.
go user.handleBackfillRequestsLoop(user.BackfillQueue.DeferredBackfillRequests)
go user.BackfillQueue.RunLoops(user)
go user.BackfillQueue.RunLoop(user)
// Always save the history syncs for the user. If they want to enable
// backfilling in the future, we will have it in the database.