Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Properly update retry_last_ts when hitting the maximum retry interval #16156

Merged
merged 4 commits into from
Aug 23, 2023
Merged

Properly update retry_last_ts when hitting the maximum retry interval #16156

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
63085a0
Properly update retry_last_ts when hitting the maximum retry interval
deepbluev7 Aug 22, 2023
42b3d91
Add changelog
deepbluev7 Aug 22, 2023
b73c5dc
Change fix + add test
Aug 23, 2023
ec5a756
Add comment
Aug 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/16156.bugfix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
deepbluev7 marked this conversation as resolved.
Show resolved Hide resolved
1 change: 1 addition & 0 deletions synapse/storage/databases/main/transactions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
Loading