diff options
| author | Erik Johnston <erikj@matrix.org> | 2023-08-23 13:04:46 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-23 13:04:46 +0100 |
| commit | 86ecd341ec93167fbb5a335237c1cd629e7256a2 (patch) | |
| tree | dfd302d1e79f9a59b47501d5a959f3410aaeacdb | |
| parent | Task scheduler: mark task as active if we are scheduling ASAP (#16165) (diff) | |
| download | synapse-86ecd341ec93167fbb5a335237c1cd629e7256a2.tar.xz | |
Always update `retry_last_ts` (#16164)
| -rw-r--r-- | changelog.d/16164.bugfix | 1 | ||||
| -rw-r--r-- | synapse/storage/databases/main/transactions.py | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/changelog.d/16164.bugfix b/changelog.d/16164.bugfix new file mode 100644 index 0000000000..17284297cf --- /dev/null +++ b/changelog.d/16164.bugfix @@ -0,0 +1 @@ +Fix a bug introduced in 1.87 where synapse would send an excessive amount of federation requests to servers which have been offline for a long time. Contributed by Nico. diff --git a/synapse/storage/databases/main/transactions.py b/synapse/storage/databases/main/transactions.py index 48e4b0ba3c..860bbf7c0f 100644 --- a/synapse/storage/databases/main/transactions.py +++ b/synapse/storage/databases/main/transactions.py @@ -242,8 +242,6 @@ 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). @@ -258,8 +256,10 @@ class TransactionWorkerStore(CacheInvalidationWorkerStore): retry_interval = EXCLUDED.retry_interval WHERE EXCLUDED.retry_interval = 0 + OR EXCLUDED.retry_last_ts = 0 OR destinations.retry_interval IS NULL - OR destinations.retry_interval <= EXCLUDED.retry_interval + 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)) |