diff options
| author | DeepBlueV7.X <nicolas.werner@hotmail.de> | 2023-08-23 08:35:23 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-23 09:35:23 +0100 |
| commit | 19a1cda084342034cc92c88c0376cbcadbf8e2a0 (patch) | |
| tree | e6fc17915fdeb49c049c80bd5e072b509e28f536 /synapse/storage/databases/main/transactions.py | |
| parent | Only lock when we're backfilling (#16159) (diff) | |
| download | synapse-19a1cda084342034cc92c88c0376cbcadbf8e2a0.tar.xz | |
Properly update retry_last_ts when hitting the maximum retry interval (#16156)
* Properly update retry_last_ts when hitting the maximum retry interval This was broken in 1.87 when the maximum retry interval got changed from almost infinite to a week (and made configurable). fixes #16101 Signed-off-by: Nicolas Werner <nicolas.werner@hotmail.de> * Add changelog * Change fix + add test * Add comment --------- Signed-off-by: Nicolas Werner <nicolas.werner@hotmail.de> Co-authored-by: Mathieu Velten <mathieuv@matrix.org>
Diffstat (limited to 'synapse/storage/databases/main/transactions.py')
| -rw-r--r-- | synapse/storage/databases/main/transactions.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/synapse/storage/databases/main/transactions.py b/synapse/storage/databases/main/transactions.py index c3bd36efc9..48e4b0ba3c 100644 --- a/synapse/storage/databases/main/transactions.py +++ b/synapse/storage/databases/main/transactions.py @@ -242,6 +242,8 @@ class TransactionWorkerStore(CacheInvalidationWorkerStore): ) -> None: # Upsert retry time interval if retry_interval is zero (i.e. we're # resetting it) or greater than the existing retry interval. + # We also upsert when the new retry interval is the same as the existing one, + # since it will be the case when `destination_max_retry_interval` is reached. # # WARNING: This is executed in autocommit, so we shouldn't add any more # SQL calls in here (without being very careful). @@ -257,7 +259,7 @@ class TransactionWorkerStore(CacheInvalidationWorkerStore): WHERE EXCLUDED.retry_interval = 0 OR destinations.retry_interval IS NULL - OR destinations.retry_interval < EXCLUDED.retry_interval + OR destinations.retry_interval <= EXCLUDED.retry_interval """ txn.execute(sql, (destination, failure_ts, retry_last_ts, retry_interval)) |