Fix a bug where we would accidentally skip over some events

matrix-org · May 15, 2024 · fb5e1ab · fb5e1ab
1 parent a7953fe
commit fb5e1ab
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/syncapi/sync/requestpool.go b/syncapi/sync/requestpool.go
@@ -400,6 +400,9 @@ func (rp *RequestPool) OnIncomingSyncRequest(req *http.Request, device *userapi.
 			reasonablePositions := findReasonableIncrementalSyncWindow(
 				syncReq.Since, rp.Notifier.CurrentPosition(),
 			)
+			// Also update the currentPos, which is used for the retry logic below.
+			// Otherwise we may skip over some events.
+			currentPos = reasonablePositions
 			syncReq.Response.NextBatch = types.StreamingToken{
 				PDUPosition: withTransaction(
 					syncReq.Since.PDUPosition,