Properly update retry_last_ts when hitting the maximum retry interval

This was broken in 1.90 when the maximum retry interval got changed from almost infinite to a week (and made configurable). fixes matrix-org#16101 Signed-off-by: Nicolas Werner <[email protected]>
deepbluev7 · Aug 22, 2023 · 537a294 · 537a294
1 parent 6d7c63f
commit 537a294
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/synapse/storage/databases/main/transactions.py b/synapse/storage/databases/main/transactions.py
@@ -258,6 +258,7 @@ def _set_destination_retry_timings_txn(
                     EXCLUDED.retry_interval = 0
                     OR destinations.retry_interval IS NULL
                     OR destinations.retry_interval < EXCLUDED.retry_interval
+                    OR destinations.retry_last_ts > EXCLUDED.retry_last_ts
         """
 
         txn.execute(sql, (destination, failure_ts, retry_last_ts, retry_interval))