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

Fix bug in calculating the federation retry backoff period #6025

Merged
merged 1 commit into from
Sep 12, 2019
Merged

Fix bug in calculating the federation retry backoff period #6025

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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/6025.bugfix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix bug in calculating the federation retry backoff period.
5 changes: 3 additions & 2 deletions synapse/util/retryutils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,8 +193,9 @@ def __exit__(self, exc_type, exc_val, exc_tb):
else:
# We couldn't connect.
if self.retry_interval:
self.retry_interval *= RETRY_MULTIPLIER
self.retry_interval *= int(random.uniform(0.8, 1.4))
self.retry_interval = int(
self.retry_interval * RETRY_MULTIPLIER * random.uniform(0.8, 1.4)
)

if self.retry_interval >= MAX_RETRY_INTERVAL:
self.retry_interval = MAX_RETRY_INTERVAL
Expand Down