From a22098e44529d106a32d3d60458f4dd66c339cab Mon Sep 17 00:00:00 2001
From: Neil Alexander <neilalexander@users.noreply.github.com>
Date: Mon, 3 Oct 2022 11:16:29 +0100
Subject: [PATCH] Tweak again

---
 syncapi/streams/stream_pdu.go | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/syncapi/streams/stream_pdu.go b/syncapi/streams/stream_pdu.go
index 4595253a1..d252265ff 100644
--- a/syncapi/streams/stream_pdu.go
+++ b/syncapi/streams/stream_pdu.go
@@ -101,7 +101,10 @@ func (p *PDUStreamProvider) CompleteSync(
 		)
 		if jerr != nil {
 			req.Log.WithError(jerr).Error("p.getJoinResponseForCompleteSync failed")
-			return from
+			if err == context.DeadlineExceeded || err == context.Canceled || err == sql.ErrTxDone {
+				return from
+			}
+			continue
 		}
 		req.Response.Rooms.Join[roomID] = *jr
 		req.Rooms[roomID] = gomatrixserverlib.Join