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

Don't reset next batch position on timeout

Browse source
This commit is contained in:
Neil Alexander 2021-01-06 17:05:42 +00:00
parent 722510ac9f
commit c31a1767f7
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
syncapi/sync/requestpool.go
View file

@ -168,15 +168,21 @@ func (rp *RequestPool) OnIncomingSyncRequest(req *http.Request, device *userapi.
// Use a subcontext so that we don't keep the StreamNotifyAfter // Use a subcontext so that we don't keep the StreamNotifyAfter
// goroutines alive any longer than they really need to be. // goroutines alive any longer than they really need to be.
waitctx, waitcancel := context.WithCancel(syncReq.Context) waitctx, waitcancel := context.WithCancel(syncReq.Context)
giveup := func() util.JSONResponse {
waitcancel()
syncReq.Response.NextBatch = syncReq.Since
return util.JSONResponse{
Code: http.StatusOK,
JSON: syncReq.Response,
}
}
select { select {
case <-waitctx.Done(): // Caller gave up case <-waitctx.Done(): // Caller gave up
waitcancel() return giveup()
return util.JSONResponse{Code: http.StatusOK, JSON: syncReq.Response}
case <-timer.C: // Timeout reached case <-timer.C: // Timeout reached
waitcancel() return giveup()
return util.JSONResponse{Code: http.StatusOK, JSON: syncReq.Response}
case <-rp.pduStream.NotifyAfter(waitctx, syncReq.Since.PDUPosition): case <-rp.pduStream.NotifyAfter(waitctx, syncReq.Since.PDUPosition):
case <-rp.typingStream.NotifyAfter(waitctx, syncReq.Since.TypingPosition): case <-rp.typingStream.NotifyAfter(waitctx, syncReq.Since.TypingPosition):